Abstract
')).end().html(), @@ -66,9 +66,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `INFORMS - ${category}`, link: cateUrl, item: items, - }; + }); }; diff --git a/lib/v2/inoreader/index.js b/lib/v2/inoreader/index.js index 563ff61970..15d6e441ad 100644 --- a/lib/v2/inoreader/index.js +++ b/lib/v2/inoreader/index.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const type = 'html'; - const user = ctx.params.user; - const tag = ctx.params.tag; - const num = ctx.query.limit || 20; + const user = ctx.req.param('user'); + const tag = ctx.req.param('tag'); + const num = ctx.req.query('limit') || 20; const rootUrl = 'https://www.inoreader.com/stream'; const currentUrl = `${rootUrl}/user/${user}/tag/${tag}/view/${type}?n=${num}`; @@ -15,10 +15,10 @@ module.exports = async (ctx) => { url: currentUrl, }); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const entries = $('#snip_body>.article_content'); - ctx.state.data = { + ctx.set('data', { title: $('.header_text').text().trim(), link: currentUrl, item: entries @@ -41,6 +41,6 @@ module.exports = async (ctx) => { }) .get(), allowEmpty: true, - }; + }); ctx.state.json = ctx.state.data; }; diff --git a/lib/v2/inoreader/rss.js b/lib/v2/inoreader/rss.js index 39f0d9bc3e..465d610a21 100644 --- a/lib/v2/inoreader/rss.js +++ b/lib/v2/inoreader/rss.js @@ -1,9 +1,9 @@ const parser = require('@/utils/rss-parser'); -const cheerio = require('cheerio'); +import { load } from 'cheerio'; module.exports = async (ctx) => { - const user = ctx.params.user; - const tag = ctx.params.tag; + const user = ctx.req.param('user'); + const tag = ctx.req.param('tag'); const rootUrl = 'https://www.inoreader.com/stream'; const rssUrl = `${rootUrl}/user/${user}/tag/${tag}`; const feed = await parser.parseURL(rssUrl); @@ -13,7 +13,7 @@ module.exports = async (ctx) => { // get first image in content let firstImgSrc = ''; if (item.content !== null) { - const $ = cheerio.load(item.content); + const $ = load(item.content); firstImgSrc = $('img').first().attr('src'); } return { @@ -36,12 +36,12 @@ module.exports = async (ctx) => { category: item?.categories ?? [], }; }); - ctx.state.data = { + ctx.set('data', { title: feed.title, itunes_author: 'Inoreader', image: 'https://www.inoreader.com/brand/img/ino_app_icon.png', link: feed.link, description: feed.description, item: feed.items, - }; + }); }; diff --git a/lib/v2/instagram/common-utils.js b/lib/v2/instagram/common-utils.js index 96dcf91b06..3cb7398f9a 100644 --- a/lib/v2/instagram/common-utils.js +++ b/lib/v2/instagram/common-utils.js @@ -1,5 +1,5 @@ -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const renderItems = (items) => diff --git a/lib/v2/instagram/private-api/index.js b/lib/v2/instagram/private-api/index.js index 936343fbf0..5328007e5d 100644 --- a/lib/v2/instagram/private-api/index.js +++ b/lib/v2/instagram/private-api/index.js @@ -1,6 +1,6 @@ const { ig, login } = require('./utils'); const logger = require('@/utils/logger'); -const config = require('@/config').value; +import { config } from '@/config'; const { renderItems } = require('../common-utils'); // loadContent pulls the desired user/tag/etc @@ -81,7 +81,7 @@ module.exports = async (ctx) => { throw error; } - ctx.state.data = { + ctx.set('data', { title: data.feedTitle, link: data.feedLink, description: data.feedDescription, @@ -90,5 +90,5 @@ module.exports = async (ctx) => { logo: data.feedLogo, image: data.feedLogo, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/instagram/private-api/utils.js b/lib/v2/instagram/private-api/utils.js index 9f1a23ccd3..ccf6b29fc7 100644 --- a/lib/v2/instagram/private-api/utils.js +++ b/lib/v2/instagram/private-api/utils.js @@ -1,6 +1,6 @@ const { IgApiClient } = require('instagram-private-api'); const logger = require('@/utils/logger'); -const config = require('@/config').value; +import { config } from '@/config'; const ig = new IgApiClient(); diff --git a/lib/v2/instagram/web-api/index.js b/lib/v2/instagram/web-api/index.js index fae1a5fc3c..453294e77d 100644 --- a/lib/v2/instagram/web-api/index.js +++ b/lib/v2/instagram/web-api/index.js @@ -1,5 +1,5 @@ const { CookieJar } = require('tough-cookie'); -const config = require('@/config').value; +import { config } from '@/config'; const { renderItems } = require('../common-utils'); const { baseUrl, COOKIE_URL, checkLogin, getUserInfo, getUserFeedItems, getTagsFeedItems, getLoggedOutTagsFeedItems, renderGuestItems } = require('./utils'); @@ -75,7 +75,7 @@ module.exports = async (ctx) => { await ctx.cache.set('instagram:cookieJar', cookieJar.toJSON(), 31_536_000); - ctx.state.data = { + ctx.set('data', { title: feedTitle, link: feedLink, description: feedDescription, @@ -84,5 +84,5 @@ module.exports = async (ctx) => { logo: feedLogo, image: feedLogo, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/instagram/web-api/utils.js b/lib/v2/instagram/web-api/utils.js index 6e1062bdc5..d1eaeb5d74 100644 --- a/lib/v2/instagram/web-api/utils.js +++ b/lib/v2/instagram/web-api/utils.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const config = require('@/config').value; -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { config } from '@/config'; +import { art } from '@/utils/render'; const path = require('path'); const baseUrl = 'https://www.instagram.com'; diff --git a/lib/v2/instructables/projects.js b/lib/v2/instructables/projects.js index 00dbd59666..7bcd1bfcaf 100644 --- a/lib/v2/instructables/projects.js +++ b/lib/v2/instructables/projects.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; module.exports = async (ctx) => { - const category = ctx.params.category ?? 'all'; + const category = ctx.req.param('category') ?? 'all'; const siteDomain = 'www.instructables.com'; const apiKey = 'NU5CdGwyRDdMVnVmM3l4cWNqQzFSVzJNZU5jaUxFU3dGK3J2L203MkVmVT02ZWFYeyJleGNsdWRlX2ZpZWxkcyI6WyJvdXRfb2YiLCJzZWFyY2hfdGltZV9tcyIsInN0ZXBCb2R5Il0sInBlcl9wYWdlIjo1MH0='; @@ -39,7 +39,7 @@ module.exports = async (ctx) => { const data = response.data; - ctx.state.data = { + ctx.set('data', { title: 'Instructables Projects', // 项目的标题 link, // 指向项目的链接 description: 'Instructables Projects', // 描述项目 @@ -52,5 +52,5 @@ module.exports = async (ctx) => { pubDate: new Date(item.document.publishDate).toUTCString(), category: item.document.primaryClassification, })), - }; + }); }; diff --git a/lib/v2/iqilu/program.js b/lib/v2/iqilu/program.js index 666787874b..61fb3f5c25 100644 --- a/lib/v2/iqilu/program.js +++ b/lib/v2/iqilu/program.js @@ -1,19 +1,19 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { const { category = 'sdws/sdxwlb' } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 30; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 30; const rootUrl = 'http://v.iqilu.com'; const currentUrl = new URL(category, rootUrl).href; const { data: response } = await got(currentUrl); - const $ = cheerio.load(response); + const $ = load(response); let items = $('#jmzhanshi1 dl') .slice(0, limit) @@ -51,7 +51,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(item.link, async () => { const { data: detailResponse } = await got(item.link); - const content = cheerio.load(detailResponse); + const content = load(detailResponse); item.title = content('div.vtitle').text(); item.enclosure_url = content('#copy_mp4text').prop('value'); @@ -80,7 +80,7 @@ module.exports = async (ctx) => { .map((a) => $(a).text()) .join('/'); - ctx.state.data = { + ctx.set('data', { item: items, title: $('title').text(), link: currentUrl, @@ -94,5 +94,5 @@ module.exports = async (ctx) => { itunes_author: author, itunes_category: 'News', allowEmpty: true, - }; + }); }; diff --git a/lib/v2/iqiyi/album.js b/lib/v2/iqiyi/album.js index 551c383d4b..83568ede18 100644 --- a/lib/v2/iqiyi/album.js +++ b/lib/v2/iqiyi/album.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const { data: response } = await got(`https://www.iq.com/album/${id}`); - const $ = cheerio.load(response); + const $ = load(response); const nextData = JSON.parse($('#__NEXT_DATA__').text()); const { album } = nextData.props.initialState; @@ -51,12 +51,12 @@ module.exports = async (ctx) => { pubDate: parseDate(item.initIssueTime), })); - ctx.state.data = { + ctx.set('data', { title: baseInfo.name, description: baseInfo.description, image: album.videoAlbumInfo.albumFocus1024, link: `https://www.iq.com/album/${album.videoAlbumInfo.albumLocSuffix}`, item: items, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/iqiyi/video.js b/lib/v2/iqiyi/video.js index 5c0dbe7126..cd58656fe3 100644 --- a/lib/v2/iqiyi/video.js +++ b/lib/v2/iqiyi/video.js @@ -1,15 +1,17 @@ -const cheerio = require('cheerio'); -const config = require('@/config').value; -const { parseDate } = require('@/utils/parse-date'); +import { load } from 'cheerio'; +import { config } from '@/config'; +import { parseDate } from '@/utils/parse-date'; const logger = require('@/utils/logger'); +import puppeteer from '@/utils/puppeteer'; + // /iqiyi/user/video/:uid // http://localhost:1200/iqiyi/user/video/2289191062 module.exports = async (ctx) => { - const uid = ctx.params.uid; + const uid = ctx.req.param('uid'); const link = `https://www.iqiyi.com/u/${uid}/videos`; // Use puppeteer because iqiyi page has a delay. - const browser = await require('@/utils/puppeteer')(); + const browser = puppeteer(); const data = await ctx.cache.tryGet( link, async () => { @@ -25,7 +27,7 @@ module.exports = async (ctx) => { await page.waitForSelector('li.pic-txt-li'); const html = await page.content(); - const $ = cheerio.load(html); + const $ = load(html); const list = $('li.pic-txt-li'); return { diff --git a/lib/v2/iqnew/latest.js b/lib/v2/iqnew/latest.js index fc7e33b734..8f3009018c 100644 --- a/lib/v2/iqnew/latest.js +++ b/lib/v2/iqnew/latest.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const iconv = require('iconv-lite'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const rootUrl = 'https://www.iqnew.com'; @@ -13,9 +13,9 @@ module.exports = async (ctx) => { responseType: 'buffer', }); - const $ = cheerio.load(iconv.decode(response.data, 'gb2312')); + const $ = load(iconv.decode(response.data, 'gb2312')); const list = $('.page-main-list .list-item a') - .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 50) + .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 50) .toArray() .map((item) => { item = $(item); @@ -34,7 +34,7 @@ module.exports = async (ctx) => { responseType: 'buffer', }); - const content = cheerio.load(iconv.decode(detailResponse.data, 'gb2312')); + const content = load(iconv.decode(detailResponse.data, 'gb2312')); item.title = content('.main-article .title').text(); item.pubDate = timezone(parseDate(content('.time').eq(0).text()), 8); @@ -49,9 +49,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '爱Q生活网 - 最近更新', link: url, item: items, - }; + }); }; diff --git a/lib/v2/iresearch/report.js b/lib/v2/iresearch/report.js index d1db3cf58b..b5e29a7992 100644 --- a/lib/v2/iresearch/report.js +++ b/lib/v2/iresearch/report.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; function processReport(item, ctx) { const apiUrl = `https://www.iresearch.com.cn/api/Detail/reportM?id=${item.NewsId}&isfree=0`; @@ -28,7 +28,7 @@ function processReport(item, ctx) { } module.exports = async (ctx) => { - const limit = isNaN(Number.parseInt(ctx.query.limit)) ? 20 : Number.parseInt(ctx.query.limit); + const limit = isNaN(Number.parseInt(ctx.req.query('limit'))) ? 20 : Number.parseInt(ctx.req.query('limit')); const apiUrl = `https://www.iresearch.com.cn/api/products/GetReportList?fee=0&date=&lastId=&pageSize=${limit}`; const pageUrl = 'https://www.iresearch.com.cn/m/report.shtml'; @@ -51,10 +51,10 @@ module.exports = async (ctx) => { })) ); - ctx.state.data = { + ctx.set('data', { title: '艾瑞产业研究报告', link: pageUrl, description: '艾瑞产业研究报告', item: items, - }; + }); }; diff --git a/lib/v2/iresearch/weekly.js b/lib/v2/iresearch/weekly.js index a4e3e73899..76376a8b26 100644 --- a/lib/v2/iresearch/weekly.js +++ b/lib/v2/iresearch/weekly.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { - const category = ctx.params.category ?? ''; + const category = ctx.req.param('category') ?? ''; const rootUrl = 'https://www.iresearch.com.cn'; const currentUrl = `${rootUrl}/report?type=3`; @@ -17,7 +17,7 @@ module.exports = async (ctx) => { const items = JSON.parse(response.data.slice(1)) .filter((item) => (category ? item.classname === category : true)) - .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 200) + .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 200) .map((item) => ({ title: item.reportname, pubDate: parseDate(item.addtime), @@ -31,9 +31,9 @@ module.exports = async (ctx) => { }), })); - ctx.state.data = { + ctx.set('data', { title: '艾瑞咨询 - 周度市场观察', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/issuehunt/funded.js b/lib/v2/issuehunt/funded.js index fd519cc028..3ea269b5bb 100644 --- a/lib/v2/issuehunt/funded.js +++ b/lib/v2/issuehunt/funded.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const MarkdownIt = require('markdown-it'); module.exports = async (ctx) => { @@ -13,7 +13,7 @@ module.exports = async (ctx) => { const md = MarkdownIt({ html: true, }); - ctx.state.data = { + ctx.set('data', { title: `Issue Hunt 的悬赏 -- ${username}/${repo}`, link: `https://issuehunt.io/r/${username}/${repo}`, description: ``, @@ -24,5 +24,5 @@ module.exports = async (ctx) => { link: `https://issuehunt.io/r/${username}/${repo}/issues/${item.number}`, author: item.userName, })), - }; + }); }; diff --git a/lib/v2/itch/devlog.js b/lib/v2/itch/devlog.js index af0b60a1c3..2d7fc6debf 100644 --- a/lib/v2/itch/devlog.js +++ b/lib/v2/itch/devlog.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const { isValidHost } = require('@/utils/valid-host'); module.exports = async (ctx) => { - const user = ctx.params.user ?? ''; - const id = ctx.params.id ?? ''; + const user = ctx.req.param('user') ?? ''; + const id = ctx.req.param('id') ?? ''; if (!isValidHost(user)) { throw new Error('Invalid user'); } @@ -20,7 +20,7 @@ module.exports = async (ctx) => { url: rootUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.title') .toArray() @@ -42,7 +42,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.author = detailResponse.data.match(/"author":{".*?","name":"(.*?)"/)[1]; item.pubDate = parseDate(detailResponse.data.match(/"datePublished":"(.*?)"/)[1]); @@ -58,9 +58,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: rootUrl, item: items, - }; + }); }; diff --git a/lib/v2/itch/index.js b/lib/v2/itch/index.js index c49873a243..b94c295126 100644 --- a/lib/v2/itch/index.js +++ b/lib/v2/itch/index.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -12,7 +12,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.title.game_link') .toArray() @@ -33,7 +33,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.author = content('title').text().split('by ').pop(); item.description = art(path.join(__dirname, 'templates/description.art'), { @@ -48,9 +48,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/itch/posts.js b/lib/v2/itch/posts.js index 3d84907811..33d043323a 100644 --- a/lib/v2/itch/posts.js +++ b/lib/v2/itch/posts.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const topic = ctx.params.topic; - const id = ctx.params.id; + const topic = ctx.req.param('topic'); + const id = ctx.req.param('id'); const rootUrl = 'https://itch.io'; const currentUrl = `${rootUrl}/t/${topic}/${id}?before=999999999`; @@ -14,7 +14,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const items = $('.post_grid') .toArray() @@ -33,9 +33,9 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/ithome/index.js b/lib/v2/ithome/index.js index adaad50531..d9c80551fe 100644 --- a/lib/v2/ithome/index.js +++ b/lib/v2/ithome/index.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const get_url = (caty) => `https://${caty}.ithome.com/`; @@ -34,18 +34,18 @@ const config = { }; module.exports = async (ctx) => { - const cfg = config[ctx.params.caty]; + const cfg = config[ctx.req.param('caty')]; if (!cfg) { throw new Error('Bad category. See https://docs.rsshub.app/routes/new-media#it-zhi-jia'); } - const current_url = get_url(ctx.params.caty); + const current_url = get_url(ctx.req.param('caty')); const response = await got({ method: 'get', url: current_url, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('#list > div.fl > ul > li > div > h2 > a') .slice(0, 10) .map((_, item) => { @@ -61,7 +61,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const res = await got({ method: 'get', url: item.link }); - const content = cheerio.load(res.data); + const content = load(res.data); const post = content('#paragraph'); post.find('img[data-original]').each((_, ele) => { ele = $(ele); @@ -76,10 +76,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'IT 之家 - ' + cfg.title, link: current_url, image: 'https://img.ithome.com/m/images/logo.png', item: items, - }; + }); }; diff --git a/lib/v2/ithome/ranking.js b/lib/v2/ithome/ranking.js index 4bc47ae613..c302f4cde6 100644 --- a/lib/v2/ithome/ranking.js +++ b/lib/v2/ithome/ranking.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; module.exports = async (ctx) => { - const option = ctx.params.type; + const option = ctx.req.param('type'); const response = await got({ method: 'get', url: 'https://www.ithome.com/block/rank.html', }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const config = { '24h': '24 小时最热', @@ -46,7 +46,7 @@ module.exports = async (ctx) => { method: 'get', url: item.link, }); - const content = cheerio.load(res.data); + const content = load(res.data); const paragraph = content('#paragraph'); paragraph.find('img[data-original]').each((_, ele) => { ele = $(ele); @@ -61,9 +61,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `IT之家-${title}`, link: 'https://www.ithome.com', item: items, - }; + }); }; diff --git a/lib/v2/ithome/tag.js b/lib/v2/ithome/tag.js index a5848cc878..d568644cd9 100644 --- a/lib/v2/ithome/tag.js +++ b/lib/v2/ithome/tag.js @@ -1,16 +1,16 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const rootUrl = 'https://www.ithome.com/'; module.exports = async (ctx) => { - const name = ctx.params.name; + const name = ctx.req.param('name'); const url = `${rootUrl}tag/${name}`; const response = await got(url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('ul.bl > li') .map((_, item) => ({ title: $(item).find('h2 > a').text(), @@ -34,7 +34,7 @@ module.exports = async (ctx) => { return; } - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); const article = content('div.post_content'); article.find('img[data-original]').each((_, ele) => { @@ -51,9 +51,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `IT之家 - ${name}标签`, link: url, item: items.filter(Boolean), - }; + }); }; diff --git a/lib/v2/ithome/tw/feeds.js b/lib/v2/ithome/tw/feeds.js index 68dfa92a10..e6e31bd911 100644 --- a/lib/v2/ithome/tw/feeds.js +++ b/lib/v2/ithome/tw/feeds.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const baseUrl = 'https://www.ithome.com.tw'; - const currentUrl = `${baseUrl}/${ctx.params.category}/feeds`; + const currentUrl = `${baseUrl}/${ctx.req.param('category')}/feeds`; const response = await got(currentUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const name = $('a.active-trail').text(); const items = await Promise.all( $('.title a') @@ -16,7 +16,7 @@ module.exports = async (ctx) => { const link = baseUrl + $(item).attr('href'); return ctx.cache.tryGet(link, async () => { const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); return { title: $('.page-header').text(), author: $('.author a').text(), @@ -29,10 +29,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: `${name} | iThome`, link: currentUrl, description: 'iThome Online 是臺灣第一個網路原生報，提供IT產業即時新聞、企業IT產品報導與測試、技術專題、IT應用報導、IT書訊，以及面向豐富的名家專欄。', item: items, - }; + }); }; diff --git a/lib/v2/ithome/zt.js b/lib/v2/ithome/zt.js index 8d47f5891d..37c01aaa49 100644 --- a/lib/v2/ithome/zt.js +++ b/lib/v2/ithome/zt.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const rootUrl = 'https://www.ithome.com'; const currentUrl = `${rootUrl}/zt/${id}`; @@ -14,7 +14,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.newsbody a') .map((_, item) => { @@ -35,7 +35,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); const post = content('.post_content'); post.find('img[data-original]').each((_, ele) => { @@ -54,9 +54,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${$('title').text()} - IT之家`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/iwara/index.js b/lib/v2/iwara/index.js index 42cf9d6d93..a8e30e8ad9 100644 --- a/lib/v2/iwara/index.js +++ b/lib/v2/iwara/index.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const config = require('@/config').value; +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { config } from '@/config'; const rootUrl = 'https://www.iwara.tv'; const apiRootUrl = 'https://api.iwara.tv'; @@ -35,9 +35,9 @@ const parseThumbnail = (type, item) => { }; module.exports = async (ctx) => { - const username = ctx.params.username; + const username = ctx.req.param('username'); const id = await ctx.cache.tryGet(`${apiRootUrl}/profile/${username}`, async () => (await got(`${apiRootUrl}/profile/${username}`)).data.user.id); - const type = ctx.params.type ?? 'video'; + const type = ctx.req.param('type') ?? 'video'; const items = (await ctx.cache.tryGet(`${apiUrlMap[type]}?user=${id}`, async () => (await got(`${apiUrlMap[type]}?user=${id}`)).data.results, config.cache.routeExpire, false)).map((item) => ({ title: item.title, author: username, @@ -47,9 +47,9 @@ module.exports = async (ctx) => { pubDate: parseDate(item.createdAt), })); - ctx.state.data = { + ctx.set('data', { title: `${username}'s iwara - ${typeMap[type]}`, link: `${rootUrl}/users/${username}`, item: items, - }; + }); }; diff --git a/lib/v2/iwara/subscriptions.js b/lib/v2/iwara/subscriptions.js index 2211b3e620..3bc8f57b3e 100644 --- a/lib/v2/iwara/subscriptions.js +++ b/lib/v2/iwara/subscriptions.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const config = require('@/config').value; -const { art } = require('@/utils/render'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { config } from '@/config'; +import { art } from '@/utils/render'; +import { parseDate } from '@/utils/parse-date'; const path = require('path'); const md = require('markdown-it')({ html: true, @@ -135,9 +135,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `Iwara Subscription`, link: rootUrl, item: items, - }; + }); }; diff --git a/lib/v2/ixigua/user-video.js b/lib/v2/ixigua/user-video.js index be385a3f9a..1274076ced 100644 --- a/lib/v2/ixigua/user-video.js +++ b/lib/v2/ixigua/user-video.js @@ -1,25 +1,25 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { art } from '@/utils/render'; const path = require('path'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; const host = 'https://www.ixigua.com'; module.exports = async (ctx) => { - const uid = ctx.params.uid; - const disableEmbed = ctx.params.disableEmbed; + const uid = ctx.req.param('uid'); + const disableEmbed = ctx.req.param('disableEmbed'); const url = `${host}/home/${uid}/?wid_try=1`; const response = await got(url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const jsData = $('#SSR_HYDRATED_DATA').html().replace('window._SSR_HYDRATED_DATA=', '').replaceAll('undefined', '""'); const data = JSON.parse(jsData); const videoInfos = data.AuthorVideoList.videoList; const userInfo = data.AuthorDetailInfo; - ctx.state.data = { + ctx.set('data', { title: `${userInfo.name} 的西瓜视频`, link: url, description: userInfo.introduce, @@ -33,5 +33,5 @@ module.exports = async (ctx) => { pubDate: parseDate(i.publishTime * 1000), author: userInfo.name, })), - }; + }); }; diff --git a/lib/v2/jandan/index.js b/lib/v2/jandan/index.js index cd0c19710f..560ea5c1fd 100644 --- a/lib/v2/jandan/index.js +++ b/lib/v2/jandan/index.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const parser = require('@/utils/rss-parser'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { feed.items.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); $('.wechat-hide').prev().nextAll().remove(); const single = { title: item.title, @@ -23,9 +23,9 @@ module.exports = async (ctx) => { }) ) ); - ctx.state.data = { + ctx.set('data', { title: '煎蛋', link: rootUrl, item: items, - }; + }); }; diff --git a/lib/v2/jandan/section.js b/lib/v2/jandan/section.js index bd69bc3cee..09374d834c 100644 --- a/lib/v2/jandan/section.js +++ b/lib/v2/jandan/section.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const category = ctx.params.category ?? 'top'; + const category = ctx.req.param('category') ?? 'top'; const rootUrl = 'http://i.jandan.net'; const currentUrl = `${rootUrl}/${category}`; @@ -13,11 +13,11 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const items = $('ol.commentlist li') .not('.row') - .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 50) + .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 50) .toArray() .map((item) => { item = $(item); @@ -40,9 +40,9 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: `${$('title').text()} - 煎蛋`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/japanpost/track.js b/lib/v2/japanpost/track.js index 930f70ca16..ad700eb1b8 100644 --- a/lib/v2/japanpost/track.js +++ b/lib/v2/japanpost/track.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; +import { load } from 'cheerio'; const path = require('path'); const utils = require('./utils'); @@ -8,11 +8,11 @@ let baseTitle = '日本郵便'; const baseUrl = 'https://trackings.post.japanpost.jp/services/srv/search/direct?'; module.exports = async (ctx) => { - const reqCode = ctx.params.reqCode; + const reqCode = ctx.req.param('reqCode'); const reqReqCode = 'reqCodeNo1=' + reqCode; let locale = 'ja'; - if (ctx.params.locale === 'en') { + if (ctx.req.param('locale') === 'en') { locale = 'en'; baseTitle = 'Japanpost'; } @@ -25,7 +25,7 @@ module.exports = async (ctx) => { url: link, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); utils.expandEven($); utils.expandOdd($); @@ -61,7 +61,7 @@ module.exports = async (ctx) => { let lastItemTimeStamp; let tz; - ctx.state.data = { + ctx.set('data', { title: `${baseTitle} ${reqCode} ${packageType}`, link, description: `${baseTitle} ${reqCode} ${packageType}`, @@ -108,5 +108,5 @@ module.exports = async (ctx) => { }; }) .get(), - }; + }); }; diff --git a/lib/v2/javbus/index.js b/lib/v2/javbus/index.js index c909a5f1c5..7042dcc915 100644 --- a/lib/v2/javbus/index.js +++ b/lib/v2/javbus/index.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); -const config = require('@/config').value; +import { config } from '@/config'; const toSize = (raw) => { const matches = raw.match(/(\d+(\.\d+)?)(\w+)/); @@ -14,14 +14,14 @@ const allowDomain = new Set(['javbus.com', 'javbus.org', 'javsee.icu', 'javsee.o module.exports = async (ctx) => { const isWestern = /^\/western/.test(ctx.path); - const domain = ctx.query.domain ?? 'javbus.com'; - const westernDomain = ctx.query.western_domain ?? 'javbus.org'; + const domain = ctx.req.query('domain') ?? 'javbus.com'; + const westernDomain = ctx.req.query('western_domain') ?? 'javbus.org'; const rootUrl = `https://www.${domain}`; const westernUrl = `https://www.${westernDomain}`; if (!config.feature.allow_user_supply_unsafe_domain && (!allowDomain.has(new URL(`https://${domain}/`).hostname) || !allowDomain.has(new URL(`https://${westernDomain}/`).hostname))) { - ctx.throw(403, `This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`); + throw new Error(`This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`); } const currentUrl = `${isWestern ? westernUrl : rootUrl}${ctx.path.replace(/^\/western/, '').replace(/\/home/, '')}`; @@ -36,10 +36,10 @@ module.exports = async (ctx) => { headers, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.movie-box') - .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 50) + .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 50) .toArray() .map((item) => { item = $(item); @@ -60,7 +60,7 @@ module.exports = async (ctx) => { headers, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); content('.genre').last().parent().remove(); content('input[type="checkbox"], button').remove(); @@ -109,7 +109,7 @@ module.exports = async (ctx) => { }, }); - const content = cheerio.load(`Username：${item.user.username}
`; } } @@ -152,7 +152,7 @@ module.exports = { async () => { const resp = await got(url); const html = resp.data; - const $ = cheerio.load(html); + const $ = load(html); const raw = $('[type = "application/json"]').html(); const data = JSON.parse(raw).props.pageProps; data.posts = await Promise.all( diff --git a/lib/v2/jin10/index.js b/lib/v2/jin10/index.js index 4e58337508..7a0bb44185 100644 --- a/lib/v2/jin10/index.js +++ b/lib/v2/jin10/index.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; +import { art } from '@/utils/render'; const path = require('path'); -const config = require('@/config').value; +import { config } from '@/config'; module.exports = async (ctx) => { const { important = false } = ctx.params; @@ -50,9 +50,9 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: '金十数据', link: 'https://www.jin10.com/', item: important ? item.filter((item) => item.important) : item, - }; + }); }; diff --git a/lib/v2/jin10/topic.js b/lib/v2/jin10/topic.js index 5b5252ffbc..f377d5a83f 100644 --- a/lib/v2/jin10/topic.js +++ b/lib/v2/jin10/topic.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); -const config = require('@/config').value; +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; +import { config } from '@/config'; module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const data = await ctx.cache.tryGet( `jin10:topic:${id}`, async () => { @@ -41,10 +41,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: data.title, link: `https://xnews.jin10.com/topic/${id}`, description: data.introduction, item: items, - }; + }); }; diff --git a/lib/v2/jinse/catalogue.js b/lib/v2/jinse/catalogue.js index 0ec43bc271..cb2f1d5319 100644 --- a/lib/v2/jinse/catalogue.js +++ b/lib/v2/jinse/catalogue.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const categories = { @@ -19,7 +19,7 @@ const categories = { module.exports = async (ctx) => { const { category = 'zhengce' } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 50; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 50; const rootUrl = 'https://www.jinse.cn'; const rootApiUrl = 'https://api.jinse.cn'; @@ -63,7 +63,7 @@ module.exports = async (ctx) => { const { data: detailResponse } = await got(item.link); - const content = cheerio.load(detailResponse); + const content = load(detailResponse); item.description += art(path.join(__dirname, 'templates/description.art'), { description: content('section.js-article-content').html() || content('div.js-article').html(), @@ -79,13 +79,13 @@ module.exports = async (ctx) => { const { data: currentResponse } = await got(currentUrl); - const $ = cheerio.load(currentResponse); + const $ = load(currentResponse); const author = $('meta[name="author"]').prop('content'); const image = $('a.js-logoBox img').prop('src'); const icon = new URL($('link[rel="favicon"]').prop('href'), rootUrl).href; - ctx.state.data = { + ctx.set('data', { item: items, title: `${author} - ${Object.hasOwn(categories, category) ? categories[category] : category}`, link: currentUrl, @@ -97,5 +97,5 @@ module.exports = async (ctx) => { subtitle: $('meta[name="keywords"]').prop('content'), author, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/jinse/lives.js b/lib/v2/jinse/lives.js index 94de36503e..a89908a2b2 100644 --- a/lib/v2/jinse/lives.js +++ b/lib/v2/jinse/lives.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const categories = { @@ -15,7 +15,7 @@ const categories = { module.exports = async (ctx) => { const { category = '0' } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 100; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 100; const rootUrl = 'https://jinse.cn'; const rootApiUrl = 'https://api.jinse.cn'; @@ -65,13 +65,13 @@ module.exports = async (ctx) => { const { data: currentResponse } = await got(currentUrl); - const $ = cheerio.load(currentResponse); + const $ = load(currentResponse); const author = $('meta[name="author"]').prop('content'); const image = $('a.js-logoBox img').prop('src'); const icon = new URL($('link[rel="favicon"]').prop('href'), rootUrl).href; - ctx.state.data = { + ctx.set('data', { item: items, title: `${author} - ${Object.hasOwn(categories, category) ? categories[category] : category}`, link: currentUrl, @@ -83,5 +83,5 @@ module.exports = async (ctx) => { subtitle: $('meta[name="keywords"]').prop('content'), author, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/jinse/timeline.js b/lib/v2/jinse/timeline.js index 7bc6e902a4..5732eb908a 100644 --- a/lib/v2/jinse/timeline.js +++ b/lib/v2/jinse/timeline.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { const { category = '头条' } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 50; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 50; const rootUrl = 'https://www.jinse.cn'; const rootApiUrl = 'https://api.jinse.cn'; @@ -58,7 +58,7 @@ module.exports = async (ctx) => { const { data: detailResponse } = await got(item.link); - const content = cheerio.load(detailResponse); + const content = load(detailResponse); item.description += art(path.join(__dirname, 'templates/description.art'), { description: content('section.js-article-content').html() || content('div.js-article').html(), @@ -74,13 +74,13 @@ module.exports = async (ctx) => { const { data: currentResponse } = await got(currentUrl); - const $ = cheerio.load(currentResponse); + const $ = load(currentResponse); const author = $('meta[name="author"]').prop('content'); const image = $('a.js-logoBox img').prop('src'); const icon = new URL($('link[rel="favicon"]').prop('href'), rootUrl).href; - ctx.state.data = { + ctx.set('data', { item: items, title: `${author} - ${category}`, link: currentUrl, @@ -92,5 +92,5 @@ module.exports = async (ctx) => { subtitle: $('meta[name="keywords"]').prop('content'), author, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/jisilu/index.js b/lib/v2/jisilu/index.js index df30169436..e7503aabb3 100644 --- a/lib/v2/jisilu/index.js +++ b/lib/v2/jisilu/index.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const category = ctx.params.category ?? ''; - const sort = ctx.params.sort ?? ''; - const day = ctx.params.day ?? ''; + const category = ctx.req.param('category') ?? ''; + const sort = ctx.req.param('sort') ?? ''; + const day = ctx.req.param('day') ?? ''; const rootUrl = 'https://www.jisilu.cn'; let currentUrl = '', @@ -36,12 +36,12 @@ module.exports = async (ctx) => { }); } - const $ = cheerio.load(response.data); + const $ = load(response.data); $('.nav').prevAll('.aw-item').remove(); let items = $('.aw-item') - .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 30) + .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 30) .toArray() .map((item) => { item = $(item); @@ -71,7 +71,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); content('.aw-dynamic-topic-more-operate').remove(); @@ -82,9 +82,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${name ? `${name}的${category === 'topic' ? '主题' : '回复'}` : '广场'} - 集思录`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/jjwxc/author.js b/lib/v2/jjwxc/author.js index 84e7cfee37..d659fb00b1 100644 --- a/lib/v2/jjwxc/author.js +++ b/lib/v2/jjwxc/author.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const iconv = require('iconv-lite'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -16,7 +16,7 @@ module.exports = async (ctx) => { responseType: 'buffer', }); - const $ = cheerio.load(iconv.decode(response, 'gbk')); + const $ = load(iconv.decode(response, 'gbk')); const bookEl = $('font a').first(); const bookInfoEl = bookEl.parent(); @@ -53,7 +53,7 @@ module.exports = async (ctx) => { const image = `https:${logoEl.prop('src')}`; const icon = new URL('favicon.ico', rootUrl).href; - ctx.state.data = { + ctx.set('data', { item: items, title: `${logoEl.prop('alt').replace(/logo/, '')} | ${author} - 最近更新`, link: currentUrl, @@ -64,5 +64,5 @@ module.exports = async (ctx) => { logo: icon, subtitle: $('meta[name="Description"]').prop('content'), author, - }; + }); }; diff --git a/lib/v2/jjwxc/book.js b/lib/v2/jjwxc/book.js index f469ca6c8a..26b05140b1 100644 --- a/lib/v2/jjwxc/book.js +++ b/lib/v2/jjwxc/book.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const iconv = require('iconv-lite'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { const { id } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 100; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 100; const rootUrl = 'https://www.jjwxc.net'; const currentUrl = new URL(`onebook.php?novelid=${id}`, rootUrl).href; @@ -17,7 +17,7 @@ module.exports = async (ctx) => { responseType: 'buffer', }); - const $ = cheerio.load(iconv.decode(response, 'gbk')); + const $ = load(iconv.decode(response, 'gbk')); const author = $('meta[name="Author"]').prop('content'); const keywords = $('meta[name="Keywords"]').prop('content').split(/,/); @@ -71,7 +71,7 @@ module.exports = async (ctx) => { responseType: 'buffer', }); - const content = cheerio.load(iconv.decode(detailResponse, 'gbk')); + const content = load(iconv.decode(detailResponse, 'gbk')); content('span.favorite_novel').parent().remove(); @@ -91,7 +91,7 @@ module.exports = async (ctx) => { const image = `https:${logoEl.prop('src')}`; const icon = new URL('favicon.ico', rootUrl).href; - ctx.state.data = { + ctx.set('data', { item: items, title: `${logoEl.prop('alt').replace(/logo/, '')} | ${author}${keywords[0]}`, link: currentUrl, @@ -102,5 +102,5 @@ module.exports = async (ctx) => { logo: icon, subtitle: $('meta[name="Description"]').prop('content'), author: $('meta[name="Author"]').prop('content'), - }; + }); }; diff --git a/lib/v2/jornada/index.js b/lib/v2/jornada/index.js index c53dd7d466..6d85e714fc 100644 --- a/lib/v2/jornada/index.js +++ b/lib/v2/jornada/index.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const rootUrl = 'https://www.jornada.com.mx'; @@ -24,8 +24,8 @@ const getDateForToday = () => { }; module.exports = async (ctx) => { - const date = ctx.params.date === 'today' || ctx.params.date === undefined ? getDateForToday() : ctx.params.date; - const category = ctx.params.category; + const date = ctx.req.param('date') === 'today' || ctx.req.param('date') === undefined ? getDateForToday() : ctx.req.param('date'); + const category = ctx.req.param('category'); const url = `${rootUrl}/jsonstorage/articles_${date}_.json`; const response = await got(url); @@ -51,9 +51,9 @@ module.exports = async (ctx) => { })); } - ctx.state.data = { + ctx.set('data', { title: 'La Jornada', link: rootUrl, item: items, - }; + }); }; diff --git a/lib/v2/jou/home.js b/lib/v2/jou/home.js index 5a88b93798..950d6cf1b9 100644 --- a/lib/v2/jou/home.js +++ b/lib/v2/jou/home.js @@ -7,12 +7,12 @@ module.exports = async (ctx) => { const out = await getItems(ctx, url, host, 'winstyle106390', 'timestyle106390', 'titlestyle106402', 'timestyle106402'); // 生成RSS源 - ctx.state.data = { + ctx.set('data', { // 项目标题 title: '江苏海洋大学 -- 通知公告', // 项目链接 link: url, // items的内容 item: out, - }; + }); }; diff --git a/lib/v2/jou/utils/index.js b/lib/v2/jou/utils/index.js index e072a34e78..85e14b4779 100644 --- a/lib/v2/jou/utils/index.js +++ b/lib/v2/jou/utils/index.js @@ -1,17 +1,17 @@ // 导入got库，该库用来请求网页数据 -const got = require('@/utils/got'); +import got from '@/utils/got'; // 导入cheerio库，该库用来解析网页数据 -const cheerio = require('cheerio'); +import { load } from 'cheerio'; // 导入parseDate函数，该函数用于日期处理 -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; // 导入timezone库，该库用于时区处理 -const timezone = require('@/utils/timezone'); +import timezone from '@/utils/timezone'; async function getItems(ctx, url, host, tableClass, timeStyleClass1, titleStyleClass, timeStyleClass2) { // 发起Http请求，获取网页数据 const response = await got({ url, https: { rejectUnauthorized: false } }); // 解析网页数据 - const $ = cheerio.load(response.data); + const $ = load(response.data); // 通知公告的items的标题、url链接、发布日期 const list = $(`table.${tableClass} > tbody > tr[height=20]`) @@ -38,7 +38,7 @@ async function getItems(ctx, url, host, tableClass, timeStyleClass1, titleStyleC item.link = response.redirectUrls[0]; item.description = '该通知无法直接预览，请点击原文链接↑查看'; } else { - const $ = cheerio.load(response.data); + const $ = load(response.data); item.title = $(`.${titleStyleClass}`).text(); item.description = $('.v_news_content') .html() diff --git a/lib/v2/jou/yz.js b/lib/v2/jou/yz.js index 94ce276211..944c0ba37a 100644 --- a/lib/v2/jou/yz.js +++ b/lib/v2/jou/yz.js @@ -7,12 +7,12 @@ module.exports = async (ctx) => { const out = await getItems(ctx, url, host, 'winstyle207638', 'timestyle207638', 'titlestyle207543', 'timestyle207543'); // 生成RSS源 - ctx.state.data = { + ctx.set('data', { // 项目标题 title: '江苏海洋大学 -- 研招通知公告', // 项目链接 link: url, // items的内容 item: out, - }; + }); }; diff --git a/lib/v2/jseea/news.js b/lib/v2/jseea/news.js index 2f589796c1..c5c7b46a6d 100644 --- a/lib/v2/jseea/news.js +++ b/lib/v2/jseea/news.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; // 参考 bit/jwc 北京理工大学的的页面写成 @@ -9,11 +9,11 @@ const baseUrl = 'https://www.jseea.cn'; const siteTitle = ' - 江苏省教育考试院'; // 专门定义一个function用于加载文章内容 -async function load(link) { +async function loadContent(link) { // 异步请求文章 const { data: response } = await got(link); // 加载文章内容 - const $ = cheerio.load(response); + const $ = load(response); // 提取文章内容 $('strong').remove(); const description = $('#content').html(); @@ -23,10 +23,10 @@ async function load(link) { module.exports = async (ctx) => { // 默认 正常规定 然后获取列表页面 - const type = ctx.params.type ?? 'zkyw'; + const type = ctx.req.param('type') ?? 'zkyw'; const listPageUrl = `${baseUrl}/webfile/news/${type}/`; const { data: response } = await got(listPageUrl); - const $ = cheerio.load(response); + const $ = load(response); // console.log(type+":"+listPageUrl); // 获取当前页面的 list @@ -49,16 +49,16 @@ module.exports = async (ctx) => { // 遍历每一篇文章 list.map((item) => ctx.cache.tryGet(item.link, async () => { - item.description = await load(item.link); + item.description = await loadContent(item.link); // 合并解析后的结果集作为该篇文章最终的输出结果 return item; }) ) ); - ctx.state.data = { + ctx.set('data', { title: $('head title').text() + siteTitle, link: listPageUrl, item: result, - }; + }); }; diff --git a/lib/v2/jsu/cxzx.js b/lib/v2/jsu/cxzx.js index 2aad79f5a7..6a3b784154 100644 --- a/lib/v2/jsu/cxzx.js +++ b/lib/v2/jsu/cxzx.js @@ -1,7 +1,7 @@ // 导入必要的模组 -const got = require('@/utils/got'); // 自订的 got -const cheerio = require('cheerio'); // 可以使用类似 jQuery 的 API HTML 解析器 -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; // 自订的 got +import { load } from 'cheerio'; // 可以使用类似 jQuery 的 API HTML 解析器 +import { parseDate } from '@/utils/parse-date'; const { getPageItemAndDate } = require('./utils/index'); module.exports = async (ctx) => { @@ -36,7 +36,7 @@ module.exports = async (ctx) => { url: urls[types].url, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('tr[height="20"]').toArray(); const out = await Promise.all( @@ -65,11 +65,11 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { // 在此处输出您的 RSS title: `吉首大学创新中心 - ${urls[types].title}`, link: urls[types].url, description: '吉首大学创新中心', item: out, - }; + }); }; diff --git a/lib/v2/jsu/jwc.js b/lib/v2/jsu/jwc.js index eacd448dab..8983c7bffc 100644 --- a/lib/v2/jsu/jwc.js +++ b/lib/v2/jsu/jwc.js @@ -1,7 +1,7 @@ // 导入必要的模组 -const got = require('@/utils/got'); // 自订的 got -const cheerio = require('cheerio'); // 可以使用类似 jQuery 的 API HTML 解析器 -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; // 自订的 got +import { load } from 'cheerio'; // 可以使用类似 jQuery 的 API HTML 解析器 +import { parseDate } from '@/utils/parse-date'; const { getPageItemAndDate } = require('@/v2/jsu/utils'); module.exports = async (ctx) => { @@ -22,7 +22,7 @@ module.exports = async (ctx) => { url: selectors[types].url, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('a.c135042').toArray(); const out = await Promise.all( list.map((item) => { @@ -49,11 +49,11 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { // 在此处输出您的 RSS title: `吉首大学教务处 - ${selectors[types].category}`, link: selectors[types].url, description: `吉首大学教务处 - ${selectors[types].category}`, item: out, - }; + }); }; diff --git a/lib/v2/jsu/math.js b/lib/v2/jsu/math.js index 72f37eadfc..da11fc1b62 100644 --- a/lib/v2/jsu/math.js +++ b/lib/v2/jsu/math.js @@ -1,7 +1,7 @@ // 导入必要的模组 -const got = require('@/utils/got'); // 自订的 got -const cheerio = require('cheerio'); // 可以使用类似 jQuery 的 API HTML 解析器 -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; // 自订的 got +import { load } from 'cheerio'; // 可以使用类似 jQuery 的 API HTML 解析器 +import { parseDate } from '@/utils/parse-date'; const { getPageItemAndDate } = require('@/v2/jsu/utils'); module.exports = async (ctx) => { @@ -12,7 +12,7 @@ module.exports = async (ctx) => { url: 'https://stxy.jsu.edu.cn/index/tzgg1.htm', }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('div.art_list').toArray(); const out = await Promise.all( list.map((item) => { @@ -32,10 +32,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '吉首大学数学与统计学院 - 通知公告', link: 'https://stxy.jsu.edu.cn/index/tzgg1.htm', description: '吉首大学数学与统计学院 - 通知公告', item: out, - }; + }); }; diff --git a/lib/v2/jsu/rjxy.js b/lib/v2/jsu/rjxy.js index aa5d5c71b9..5d26318519 100644 --- a/lib/v2/jsu/rjxy.js +++ b/lib/v2/jsu/rjxy.js @@ -1,7 +1,7 @@ // 导入必要的模组 -const got = require('@/utils/got'); // 自订的 got -const cheerio = require('cheerio'); // 可以使用类似 jQuery 的 API HTML 解析器 -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; // 自订的 got +import { load } from 'cheerio'; // 可以使用类似 jQuery 的 API HTML 解析器 +import { parseDate } from '@/utils/parse-date'; const { getPageItemAndDate } = require('@/v2/jsu/utils'); module.exports = async (ctx) => { @@ -12,7 +12,7 @@ module.exports = async (ctx) => { url: 'https://rjxy.jsu.edu.cn/index/tzgg1.htm', }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('body > div.list-box > div > ul > li').toArray(); const out = await Promise.all( list.map((item) => { @@ -33,11 +33,11 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { // 在此处输出您的 RSS title: '吉首大学计算机科学与工程学院 - 通知公告', link: 'https://rjxy.jsu.edu.cn/index/tzgg1.htm', description: '吉首大学计算机科学与工程学院 - 通知公告', item: out, - }; + }); }; diff --git a/lib/v2/jsu/universityindex.js b/lib/v2/jsu/universityindex.js index 51e1b823f6..d08c7155f7 100644 --- a/lib/v2/jsu/universityindex.js +++ b/lib/v2/jsu/universityindex.js @@ -1,7 +1,7 @@ // 导入必要的模组 -const got = require('@/utils/got'); // 自订的 got -const cheerio = require('cheerio'); // 可以使用类似 jQuery 的 API HTML 解析器 -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; // 自订的 got +import { load } from 'cheerio'; // 可以使用类似 jQuery 的 API HTML 解析器 +import { parseDate } from '@/utils/parse-date'; const { getPageItemAndDate } = require('./utils'); module.exports = async (ctx) => { @@ -12,7 +12,7 @@ module.exports = async (ctx) => { url: 'https://www.jsu.edu.cn/index/tzgg.htm', }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('body > div.container.container-fluid.dynava.no-padding.cleafix > div.con_wz_fr.fr.cleafix > div:nth-child(2) > ul > li').toArray(); const out = await Promise.all( list.map((item) => { @@ -38,11 +38,11 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { // 在此处输出您的 RSS title: '吉首大学 - 通知公告', link: 'https://www.jsu.edu.cn/index/tzgg.htm', description: '吉首大学 - 通知公告', item: out, - }; + }); }; diff --git a/lib/v2/jsu/utils/index.js b/lib/v2/jsu/utils/index.js index 1a41053d05..9ec764788b 100644 --- a/lib/v2/jsu/utils/index.js +++ b/lib/v2/jsu/utils/index.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); // 自订的 got -const cheerio = require('cheerio'); // 可以使用类似 jQuery 的 API HTML 解析器 +import got from '@/utils/got'; // 自订的 got +import { load } from 'cheerio'; // 可以使用类似 jQuery 的 API HTML 解析器 /** * 获取页面内容 @@ -13,7 +13,7 @@ async function getPageItem(selector, pageUrl) { url: pageUrl, https: { rejectUnauthorized: false }, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const page = $(selector); return page ? page.html() : '无法获取内容'; } @@ -33,7 +33,7 @@ async function getPageDetails(selector, pageUrl, titleSelector, dateSelector, da url: pageUrl, https: { rejectUnauthorized: false }, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const page = $(selector); const date = dateHander($(dateSelector).text()); const title = $(titleSelector).text(); diff --git a/lib/v2/juejin/books.js b/lib/v2/juejin/books.js index 29120e0eb4..ba8a42e6ae 100644 --- a/lib/v2/juejin/books.js +++ b/lib/v2/juejin/books.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const response = await got({ @@ -22,9 +22,9 @@ module.exports = async (ctx) => { guid: base_info.booklet_id, })); - ctx.state.data = { + ctx.set('data', { title: '掘金小册', link: 'https://juejin.cn/books', item: items, - }; + }); }; diff --git a/lib/v2/juejin/category.js b/lib/v2/juejin/category.js index f3d3b6be3a..cc26e756f0 100644 --- a/lib/v2/juejin/category.js +++ b/lib/v2/juejin/category.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const util = require('./utils'); module.exports = async (ctx) => { @@ -30,10 +30,10 @@ module.exports = async (ctx) => { } const resultItems = await util.ProcessFeed(originalData, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: `掘金 ${cat.category_name}`, link: `https://juejin.cn/${category}`, description: `掘金 ${cat.category_name}`, item: resultItems, - }; + }); }; diff --git a/lib/v2/juejin/collection.js b/lib/v2/juejin/collection.js index 99d7160afa..462fea397b 100644 --- a/lib/v2/juejin/collection.js +++ b/lib/v2/juejin/collection.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const util = require('./utils'); module.exports = async (ctx) => { @@ -16,11 +16,11 @@ module.exports = async (ctx) => { const result = await util.ProcessFeed(items, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: '掘金 - 单个收藏夹', link: `https://juejin.cn/collection/${collectionId}`, description: '掘金，用户单个收藏夹', item: result, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/juejin/column.js b/lib/v2/juejin/column.js index 9fe3f16acc..80a2c6d749 100644 --- a/lib/v2/juejin/column.js +++ b/lib/v2/juejin/column.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const util = require('./utils'); module.exports = async (ctx) => { @@ -22,10 +22,10 @@ module.exports = async (ctx) => { const columnName = detailData && detailData.column_version && detailData.column_version.title; const resultItems = await util.ProcessFeed(data, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: `掘金专栏-${columnName}`, link: `https://juejin.cn/column/${id}`, description: `掘金专栏-${columnName}`, item: resultItems, - }; + }); }; diff --git a/lib/v2/juejin/favorites.js b/lib/v2/juejin/favorites.js index f267d623f1..5f5da8d7b2 100644 --- a/lib/v2/juejin/favorites.js +++ b/lib/v2/juejin/favorites.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const util = require('./utils'); module.exports = async (ctx) => { @@ -29,11 +29,11 @@ module.exports = async (ctx) => { const result = await util.ProcessFeed(posts, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: '掘金 - 收藏集', link: `https://juejin.im/user/${userId}/collections`, description: '掘金，指定用户整个收藏集', item: result, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/juejin/pins.js b/lib/v2/juejin/pins.js index 330503767b..b216c24f6a 100644 --- a/lib/v2/juejin/pins.js +++ b/lib/v2/juejin/pins.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const type = ctx.params.type ?? 'recommend'; + const type = ctx.req.param('type') ?? 'recommend'; const title = { recommend: '推荐', hot: '热门', @@ -59,9 +59,9 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: `沸点 - ${title[type]}`, link: 'https://juejin.cn/pins/recommended', item: items, - }; + }); }; diff --git a/lib/v2/juejin/posts.js b/lib/v2/juejin/posts.js index 8c9b4f75d0..8791afb402 100644 --- a/lib/v2/juejin/posts.js +++ b/lib/v2/juejin/posts.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const util = require('./utils'); module.exports = async (ctx) => { @@ -16,10 +16,10 @@ module.exports = async (ctx) => { const username = data[0] && data[0].author_user_info && data[0].author_user_info.user_name; const resultItems = await util.ProcessFeed(data, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: `掘金专栏-${username}`, link: `https://juejin.cn/user/${id}/posts`, description: `掘金专栏-${username}`, item: resultItems, - }; + }); }; diff --git a/lib/v2/juejin/tag.js b/lib/v2/juejin/tag.js index fe46d258cf..8563b2c8a2 100644 --- a/lib/v2/juejin/tag.js +++ b/lib/v2/juejin/tag.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const util = require('./utils'); module.exports = async (ctx) => { @@ -31,10 +31,10 @@ module.exports = async (ctx) => { } const resultItems = await util.ProcessFeed(originalData, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: `掘金 ${tag}`, link: `https://juejin.cn/tag/${encodeURIComponent(tag)}`, description: `掘金 ${tag}`, item: resultItems, - }; + }); }; diff --git a/lib/v2/juejin/trending.js b/lib/v2/juejin/trending.js index 240f027970..d102e30221 100644 --- a/lib/v2/juejin/trending.js +++ b/lib/v2/juejin/trending.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const util = require('./utils'); module.exports = async (ctx) => { @@ -71,9 +71,9 @@ module.exports = async (ctx) => { const resultItems = await util.ProcessFeed(entrylist, ctx.cache); - ctx.state.data = { + ctx.set('data', { title, link, item: resultItems, - }; + }); }; diff --git a/lib/v2/juejin/utils.js b/lib/v2/juejin/utils.js index 587392cf3f..ad5e9ee69e 100644 --- a/lib/v2/juejin/utils.js +++ b/lib/v2/juejin/utils.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const md = require('markdown-it')({ html: true, }); // 加载文章页 -async function load(id) { +async function loadContent(id) { const response = await got({ method: 'post', url: 'https://api.juejin.cn/content_api/v1/article/detail', @@ -23,7 +23,7 @@ async function load(id) { const loadNews = async (link) => { const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); $('h1.title, .main-box .message').remove(); return { description: $('.main-box .article').html() }; }; @@ -45,7 +45,7 @@ const ProcessFeed = (list, caches) => // 使用tryGet方法从缓存获取内容。 // 当缓存中无法获取到链接内容的时候，则使用load方法加载文章内容。 - const other = await caches.tryGet(link, () => (isArticle ? load(item.article_id) : loadNews(link))); + const other = await caches.tryGet(link, () => (isArticle ? loadContent(item.article_id) : loadNews(link))); // 合并解析后的结果集作为该篇文章最终的输出结果 return { ...single, ...other }; }) diff --git a/lib/v2/jump/discount.js b/lib/v2/jump/discount.js index 518b86ea97..9481071cb3 100644 --- a/lib/v2/jump/discount.js +++ b/lib/v2/jump/discount.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); const discountUrl = 'https://switch.jumpvg.com/jump/discount/find4Discount/5/v2'; @@ -94,9 +94,9 @@ const getAllPageDiscountItem = async (countries, platform, termsId, totalNum) => // }; module.exports = async (ctx) => { - const platform = ctx.params.platform; - const filter = ctx.params.filter || 'all'; - const countries = ctx.params.countries || ''; + const platform = ctx.req.param('platform'); + const filter = ctx.req.param('filter') || 'all'; + const countries = ctx.req.param('countries') || ''; const discountNum = await getDiscountNum(platform); const allDiscountItem = await getAllPageDiscountItem(countries, platformObject[platform.toLocaleLowerCase()], filterObject[platform.toLocaleLowerCase()][filter], discountNum); @@ -106,7 +106,7 @@ module.exports = async (ctx) => { // await seqGetGameDetail(allDiscountItem, ctx); // } - ctx.state.data = { + ctx.set('data', { title: `jump 折扣-${platform}-${filterName[filter]}${countries ? `-${countries}` : ''}`, link: 'https://jumpvg.com/', description: 'jump 发现游戏', @@ -116,5 +116,5 @@ module.exports = async (ctx) => { link: item.banner, guid: `${platform}-${item.oldGameId}-${item.cutOff}`, // 平台-打折id-打折率 })), - }; + }); }; diff --git a/lib/v2/kamen-rider-official/news.js b/lib/v2/kamen-rider-official/news.js index d31c38cfbf..0a84cee6e4 100644 --- a/lib/v2/kamen-rider-official/news.js +++ b/lib/v2/kamen-rider-official/news.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { const { category } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 50; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 50; const rootUrl = 'https://www.kamen-rider-official.com'; const apiUrl = new URL('api/v1/news_articles', rootUrl).href; @@ -52,7 +52,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(item.link, async () => { const { data: detailResponse } = await got(item.link); - const content = cheerio.load(detailResponse); + const content = load(detailResponse); content('a.c-button').each(function () { content(this).parent().remove(); @@ -90,11 +90,11 @@ module.exports = async (ctx) => { ) ); - const $ = cheerio.load(currentResponse); + const $ = load(currentResponse); const icon = new URL($('link[rel="icon"]').prop('href'), rootUrl).href; - ctx.state.data = { + ctx.set('data', { item: items, title: `${$('title').text().split(/ー/)[0]}${category ? ` - ${category}` : ''}`, link: currentUrl, @@ -106,5 +106,5 @@ module.exports = async (ctx) => { subtitle: $('meta[property="keywords"]').prop('content'), author: $('meta[property="og:site_name"]').prop('content'), allowEmpty: true, - }; + }); }; diff --git a/lib/v2/kantarworldpanel/index.js b/lib/v2/kantarworldpanel/index.js index 6cbc259829..6774f19aad 100644 --- a/lib/v2/kantarworldpanel/index.js +++ b/lib/v2/kantarworldpanel/index.js @@ -1,19 +1,19 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { const { region = 'cn-en', category = 'news' } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 30; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 30; const rootUrl = 'https://www.kantarworldpanel.com/'; const currentUrl = new URL(`${region}/${category}`, rootUrl).href; const { data: response } = await got(currentUrl); - const $ = cheerio.load(response); + const $ = load(response); let items = $('ul.slide, #newssource') .find('li') @@ -67,7 +67,7 @@ module.exports = async (ctx) => { return item; } - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.title = content('h1.newshead').text(); item.description = content('div.center-content div.left-layout-col').html(); @@ -81,7 +81,7 @@ module.exports = async (ctx) => { const icon = new URL('favicon.ico', rootUrl).href; - ctx.state.data = { + ctx.set('data', { item: items, title: $('title').text(), link: currentUrl, @@ -92,5 +92,5 @@ module.exports = async (ctx) => { logo: icon, subtitle: $('meta[name="keywords"]').prop('content'), allowEmpty: true, - }; + }); }; diff --git a/lib/v2/kbs/news.js b/lib/v2/kbs/news.js index 866ca6324f..5663e488dd 100644 --- a/lib/v2/kbs/news.js +++ b/lib/v2/kbs/news.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const category = ctx.params.category ?? 'all'; - const language = ctx.params.language ?? 'e'; + const category = ctx.req.param('category') ?? 'all'; + const language = ctx.req.param('language') ?? 'e'; const rootUrl = 'http://world.kbs.co.kr'; const currentUrl = `${rootUrl}/service/news_list.htm?lang=${language}${category === 'all' ? '' : `&id=${category}`}`; @@ -15,7 +15,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); $('.comp_pagination').remove(); @@ -50,7 +50,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('.body_txt').html(); @@ -59,9 +59,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${$('.active').text() || list[0].category} - KBS WORLD`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/kbs/today.js b/lib/v2/kbs/today.js index b09f733894..e57985b9a7 100644 --- a/lib/v2/kbs/today.js +++ b/lib/v2/kbs/today.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const language = ctx.params.language ?? 'e'; + const language = ctx.req.param('language') ?? 'e'; const rootUrl = 'http://world.kbs.co.kr'; const currentUrl = `${rootUrl}/service/news_today.htm?lang=${language}`; @@ -14,7 +14,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.comp_text_1x article') .map((_, item) => { @@ -39,7 +39,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('.body_txt').html(); @@ -48,9 +48,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `Latest News | KBS WORLD`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/kcna/news.js b/lib/v2/kcna/news.js index ab3e0a026a..cb148edddb 100644 --- a/lib/v2/kcna/news.js +++ b/lib/v2/kcna/news.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const asyncPool = require('tiny-async-pool'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const { parseJucheDate, fixDesc, fetchPhoto, fetchVideo } = require('./utils'); const path = require('path'); const sanitizeHtml = require('sanitize-html'); @@ -13,7 +13,7 @@ module.exports = async (ctx) => { const pageUrl = `${rootUrl}/${lang}/category/articles/q/${category}.kcmsf`; const response = await got(pageUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); // fix
|
)(.*?)?(标准|狂野)日报投稿.*?<\/strong>(.*?)?(<\/p>|<\/div>)(.|\n)*$/;
- const $ = cheerio.load(htmlString.replace(regex, ''));
+ const $ = load(htmlString.replace(regex, ''));
$('.yingdi-car,.bbspost,.deck-set').each((i, e) => {
const className = $(e).attr('class');
diff --git a/lib/v2/lifeweek/channel.js b/lib/v2/lifeweek/channel.js
index 8ae9168e20..c4cd90c8b6 100644
--- a/lib/v2/lifeweek/channel.js
+++ b/lib/v2/lifeweek/channel.js
@@ -1,4 +1,4 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
const getRssItem = require('./utils');
const rootApiUrl = 'https://www.lifeweek.com.cn/api/userWebFollow/getFollowTagContentList?type=3&sort=2&tagId';
@@ -6,7 +6,7 @@ const rootUrl = 'https://www.lifeweek.com.cn/column';
const articleRootUrl = 'https://www.lifeweek.com.cn/article';
module.exports = async (ctx) => {
- const channel = ctx.params.id;
+ const channel = ctx.req.param('id');
const url = `${rootApiUrl}=${channel}`;
const { data } = await got(url);
const result = data.model.articleResponseList;
@@ -17,9 +17,9 @@ module.exports = async (ctx) => {
})
);
- ctx.state.data = {
+ ctx.set('data', {
title: data.model.tagName,
link: `${rootUrl}/${channel}`,
item: items,
- };
+ });
};
diff --git a/lib/v2/lifeweek/tag.js b/lib/v2/lifeweek/tag.js
index 51a20bddd3..e937c4a70c 100644
--- a/lib/v2/lifeweek/tag.js
+++ b/lib/v2/lifeweek/tag.js
@@ -1,11 +1,11 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
const getRssItem = require('./utils');
const rootApiUrl = 'https://www.lifeweek.com.cn/api/userWebFollow/getFollowTagContentList?type=4&sort=2&tagId';
const rootUrl = 'https://www.lifeweek.com.cn/articleList';
const articleRootUrl = 'https://www.lifeweek.com.cn/article';
module.exports = async (ctx) => {
- const tag = ctx.params.id;
+ const tag = ctx.req.param('id');
const url = `${rootApiUrl}=${tag}`;
const { data } = await got(url);
const result = data.model.articleResponseList;
@@ -16,9 +16,9 @@ module.exports = async (ctx) => {
})
);
- ctx.state.data = {
+ ctx.set('data', {
title: data.model.tagName,
link: `${rootUrl}/${tag}`,
item: items,
- };
+ });
};
diff --git a/lib/v2/lifeweek/utils.js b/lib/v2/lifeweek/utils.js
index 67b29ae7b9..4660cef071 100644
--- a/lib/v2/lifeweek/utils.js
+++ b/lib/v2/lifeweek/utils.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const timezone = require('@/utils/timezone');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import timezone from '@/utils/timezone';
+import { parseDate } from '@/utils/parse-date';
const articleApiRootUrl = 'https://www.lifeweek.com.cn/api/article';
async function getRssItem(item, articleLink) {
diff --git a/lib/v2/lightnovel/light-novel.js b/lib/v2/lightnovel/light-novel.js
index 02e4c097c3..ce34ecf9bb 100644
--- a/lib/v2/lightnovel/light-novel.js
+++ b/lib/v2/lightnovel/light-novel.js
@@ -1,7 +1,7 @@
-const { parseDate } = require('@/utils/parse-date');
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const config = require('@/config').value;
+import { parseDate } from '@/utils/parse-date';
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { config } from '@/config';
module.exports = async (ctx) => {
const baseUrl = 'https://www.lightnovel.us';
@@ -34,7 +34,7 @@ module.exports = async (ctx) => {
pubDate: parseDate(item.time),
author: item.author,
}))
- .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 5);
+ .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 5);
const items = await Promise.all(
list.map((item) =>
@@ -47,16 +47,16 @@ module.exports = async (ctx) => {
},
});
- const $ = cheerio.load(response);
+ const $ = load(response);
item.description = $('#article-main-contents').html();
return item;
})
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: `轻之国度-追踪${keywords}更新-${type} `,
link: baseUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/line/publisher.js b/lib/v2/line/publisher.js
index 4b9df8c2b5..f493679a9e 100644
--- a/lib/v2/line/publisher.js
+++ b/lib/v2/line/publisher.js
@@ -1,4 +1,4 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
const { baseUrl, parseList, parseItems } = require('./utils');
module.exports = async (ctx) => {
@@ -43,11 +43,11 @@ module.exports = async (ctx) => {
const items = await parseItems(list, ctx.cache.tryGet);
- ctx.state.data = {
+ ctx.set('data', {
title: `${publisherInfo.data.name} - Line Today`,
description: publisherInfo.data.introduction,
image: publisherInfo.data.icon ? `https://obs.line-scdn.net/${publisherInfo.data.icon.hash}` : undefined,
link: `${baseUrl}/${edition}/v2/publisher/${id}`,
item: items,
- };
+ });
};
diff --git a/lib/v2/line/today.js b/lib/v2/line/today.js
index 92ac773e8d..d739af5c70 100644
--- a/lib/v2/line/today.js
+++ b/lib/v2/line/today.js
@@ -1,9 +1,9 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
const { baseUrl: rootUrl, parseList, parseItems } = require('./utils');
module.exports = async (ctx) => {
- const edition = ctx.params.edition || 'tw';
- const tab = ctx.params.tab || 'top';
+ const edition = ctx.req.param('edition') || 'tw';
+ const tab = ctx.req.param('tab') || 'top';
const tabUrl = `${rootUrl}/webapi/portal/page/${tab}?country=${edition}`;
const recommendationUrl = `${rootUrl}/webapi/api/v6/recommendation/articles/listings/mytoday_rec:id?offset=0&length=50&country=${edition}&gender=&age=&excludeNoThumbnail=0&containMainSnapshot=0`;
@@ -36,9 +36,9 @@ module.exports = async (ctx) => {
const items = await parseItems(list, ctx.cache.tryGet);
- ctx.state.data = {
+ ctx.set('data', {
title: `${title} - Line Today`,
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/line/utils.js b/lib/v2/line/utils.js
index 206d09cc8b..343dcc00ff 100644
--- a/lib/v2/line/utils.js
+++ b/lib/v2/line/utils.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
const logger = require('@/utils/logger');
const baseUrl = 'https://today.line.me';
@@ -36,7 +36,7 @@ const parseItems = (list, tryGet) =>
throw error;
}
- const $ = cheerio.load(data.data.content, null, false);
+ const $ = load(data.data.content, null, false);
$('img').each((_, img) => {
delete img.attribs['data-hashid'];
diff --git a/lib/v2/linkedin/cn/index.js b/lib/v2/linkedin/cn/index.js
index 2958a14727..077797fca7 100644
--- a/lib/v2/linkedin/cn/index.js
+++ b/lib/v2/linkedin/cn/index.js
@@ -5,9 +5,9 @@ const siteUrl = 'https://www.linkedin.cn/incareer/jobs/search';
module.exports = async (ctx) => {
const { title, jobs } = await parseSearchHit(ctx);
const items = await Promise.all(jobs.map((job) => parseJobPosting(ctx, job)));
- ctx.state.data = {
+ ctx.set('data', {
title: `领英 - ${title}`,
link: siteUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/linkedin/cn/utils.js b/lib/v2/linkedin/cn/utils.js
index 95f48c955b..20e09ff81f 100644
--- a/lib/v2/linkedin/cn/utils.js
+++ b/lib/v2/linkedin/cn/utils.js
@@ -1,7 +1,7 @@
const crypto = require('crypto');
const path = require('path');
-const { art } = require('@/utils/render');
-const got = require('@/utils/got');
+import { art } from '@/utils/render';
+import got from '@/utils/got';
const { parseAttr } = require('./renderer');
const apiUrl = 'https://www.linkedin.cn/karpos/api/graphql';
@@ -66,14 +66,14 @@ const ctxToTitle = (ctx) => {
const parseSearchHit = async (ctx) => {
const variables = {
origin: 'jserp',
- isForRemoteJobsPage: !!ctx.query.remote,
+ isForRemoteJobsPage: !!ctx.req.query('remote'),
isChinaMultiNationalCorporation: false,
- count: ctx.query.limit || 20,
+ count: ctx.req.query('limit') || 20,
start: '0',
- geoUrn: `urn:li:ks_geo:${location[ctx.query.location] || ctx.query.geo || location.china}`,
- keywords: decodeURIComponent(ctx.params.keywords || ''),
- f_TPR: period[ctx.query.period] || '',
- sortType: ctx.query.relevant ? '' : 'DATE_DESCENDING',
+ geoUrn: `urn:li:ks_geo:${location[ctx.req.query('location')] || ctx.req.query('geo') || location.china}`,
+ keywords: decodeURIComponent(ctx.req.param('keywords') || ''),
+ f_TPR: period[ctx.req.query('period')] || '',
+ sortType: ctx.req.query('relevant') ? '' : 'DATE_DESCENDING',
};
const resp = await got.post(apiUrl, {
diff --git a/lib/v2/linkedin/jobs.js b/lib/v2/linkedin/jobs.js
index 268ad5349b..cf1594052b 100644
--- a/lib/v2/linkedin/jobs.js
+++ b/lib/v2/linkedin/jobs.js
@@ -1,16 +1,16 @@
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
const { parseJobSearch, KEYWORDS_QUERY_KEY, JOB_TYPES, JOB_TYPES_QUERY_KEY, EXP_LEVELS_QUERY_KEY, parseParamsToSearchParams, EXP_LEVELS, parseParamsToString } = require('./utils');
const BASE_URL = 'https://www.linkedin.com/';
const JOB_SEARCH_PATH = '/jobs-guest/jobs/api/seeMoreJobPostings/search';
module.exports = async (ctx) => {
- const jobTypesParam = parseParamsToSearchParams(ctx.params.job_types, JOB_TYPES);
- const expLevelsParam = parseParamsToSearchParams(ctx.params.exp_levels, EXP_LEVELS);
+ const jobTypesParam = parseParamsToSearchParams(ctx.req.param('job_types'), JOB_TYPES);
+ const expLevelsParam = parseParamsToSearchParams(ctx.req.param('exp_levels'), EXP_LEVELS);
let url = new URL(JOB_SEARCH_PATH, BASE_URL);
- url.searchParams.append(KEYWORDS_QUERY_KEY, ctx.params.keywords || '');
+ url.searchParams.append(KEYWORDS_QUERY_KEY, ctx.req.param('keywords') || '');
url.searchParams.append(JOB_TYPES_QUERY_KEY, jobTypesParam); // see JOB_TYPES in utils.js
url.searchParams.append(EXP_LEVELS_QUERY_KEY, expLevelsParam); // see EXPERIENCE_LEVELS in utils.js
url = url.toString();
@@ -22,10 +22,10 @@ module.exports = async (ctx) => {
});
const jobs = parseJobSearch(response.data);
- const jobTypes = parseParamsToString(ctx.params.job_types, JOB_TYPES);
- const expLevels = parseParamsToString(ctx.params.exp_levels, EXP_LEVELS);
- const feedTitle = 'LinkedIn Job Listing' + (jobTypes ? ` | Job Types: ${jobTypes}` : '') + (expLevels ? ` | Experience Levels: ${expLevels}` : '') + (ctx.params.keywords ? ` | Keywords: ${ctx.params.keywords}` : '');
- ctx.state.data = {
+ const jobTypes = parseParamsToString(ctx.req.param('job_types'), JOB_TYPES);
+ const expLevels = parseParamsToString(ctx.req.param('exp_levels'), EXP_LEVELS);
+ const feedTitle = 'LinkedIn Job Listing' + (jobTypes ? ` | Job Types: ${jobTypes}` : '') + (expLevels ? ` | Experience Levels: ${expLevels}` : '') + (ctx.req.param('keywords') ? ` | Keywords: ${ctx.req.param('keywords')}` : '');
+ ctx.set('data', {
title: feedTitle,
link: url,
description: 'This feed gets LinkedIn job posts',
@@ -40,5 +40,5 @@ module.exports = async (ctx) => {
link: job.link, // job source link
};
}),
- };
+ });
};
diff --git a/lib/v2/linkedin/utils.js b/lib/v2/linkedin/utils.js
index 407333bf7c..6e11a64d63 100644
--- a/lib/v2/linkedin/utils.js
+++ b/lib/v2/linkedin/utils.js
@@ -1,4 +1,4 @@
-const cheerio = require('cheerio');
+import { load } from 'cheerio';
const { Job } = require('./models');
/**
@@ -73,7 +73,7 @@ function parseParamsToString(params, map) {
* @returns {Job[]} Array of jobs with data filled
*/
function parseJobSearch(data) {
- const $ = cheerio.load(data);
+ const $ = load(data);
// Parse data
const jobs = $('li')
@@ -100,7 +100,7 @@ function parseJobSearch(data) {
*/
function parseJobDetail(data) {
const job = new Job();
- const $ = cheerio.load(data);
+ const $ = load(data);
job.recruiter = $('a.message-the-recruiter__cta').attr(`href`);
job.description = $('div.description__text description__text--rich').text();
diff --git a/lib/v2/linkresearcher/index.js b/lib/v2/linkresearcher/index.js
index ff8ccb8839..f3bbf3527e 100644
--- a/lib/v2/linkresearcher/index.js
+++ b/lib/v2/linkresearcher/index.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
const qs = require('query-string');
-const { parseDate } = require('@/utils/parse-date');
+import { parseDate } from '@/utils/parse-date';
const baseURL = 'https://www.linkresearcher.com';
@@ -57,12 +57,12 @@ module.exports = async (ctx) => {
author: item.authors === undefined ? '' : item.authors.join(', '),
}));
- ctx.state.data = {
+ ctx.set('data', {
title: `领研 | ${title}`,
description:
'领研是链接华人学者的人才及成果平台。领研为国内外高校、科研机构及科技企业提供科研人才招聘服务，也是青年研究者的职业发展指导及线上培训平台；研究者还可将自己的研究论文上传至领研，与超过五十万华人学者分享工作的最新进展。',
image: 'https://www.linkresearcher.com/assets/images/logo-app.png',
link: baseURL,
item: out,
- };
+ });
};
diff --git a/lib/v2/linovelib/novel.js b/lib/v2/linovelib/novel.js
index da6ad781da..a3b3eba39b 100644
--- a/lib/v2/linovelib/novel.js
+++ b/lib/v2/linovelib/novel.js
@@ -1,9 +1,9 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
module.exports = async (ctx) => {
- const response = await got(`https://www.linovelib.com/novel/${ctx.params.id}/catalog`);
- const $ = cheerio.load(response.data);
+ const response = await got(`https://www.linovelib.com/novel/${ctx.req.param('id')}/catalog`);
+ const $ = load(response.data);
const meta = $('.book-meta');
const title = meta.children().first().text();
@@ -23,11 +23,11 @@ module.exports = async (ctx) => {
.get();
items.reverse();
- ctx.state.data = {
+ ctx.set('data', {
title: `哩哔轻小说 - ${title}`,
- link: `https://www.linovelib.com/novel/${ctx.params.id}/catalog`,
+ link: `https://www.linovelib.com/novel/${ctx.req.param('id')}/catalog`,
description: title,
language: 'zh',
item: items,
- };
+ });
};
diff --git a/lib/v2/liquipedia/cs-matches.js b/lib/v2/liquipedia/cs-matches.js
index 2abc637c81..ba8b16c5a0 100644
--- a/lib/v2/liquipedia/cs-matches.js
+++ b/lib/v2/liquipedia/cs-matches.js
@@ -1,8 +1,8 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
module.exports = async (ctx) => {
- const team = ctx.params.team;
+ const team = ctx.req.param('team');
const rootUrl = 'https://liquipedia.net';
const currentUrl = `${rootUrl}/counterstrike/${team}/Matches`;
@@ -12,7 +12,7 @@ module.exports = async (ctx) => {
url: currentUrl,
});
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('.recent-matches-bg-lose, .recent-matches-bg-win');
const matches = list
@@ -38,9 +38,9 @@ module.exports = async (ctx) => {
})
.get();
- ctx.state.data = {
+ ctx.set('data', {
title: `[Counter-Strike] ${team} Match Results From Liquipedia`,
link: currentUrl,
item: matches,
- };
+ });
};
diff --git a/lib/v2/liquipedia/dota2-matches.js b/lib/v2/liquipedia/dota2-matches.js
index aaed4abf39..37d5a09c26 100644
--- a/lib/v2/liquipedia/dota2-matches.js
+++ b/lib/v2/liquipedia/dota2-matches.js
@@ -1,9 +1,9 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
- const team = ctx.params.id;
+ const team = ctx.req.param('id');
const url = `https://liquipedia.net/dota2/${team}`;
const response = await got({
method: 'get',
@@ -12,10 +12,10 @@ module.exports = async (ctx) => {
const data = response.data;
- const $ = cheerio.load(data);
+ const $ = load(data);
const list = $('div.recent-matches > table > tbody > tr[style]');
- ctx.state.data = {
+ ctx.set('data', {
title: `Liquipedia Dota2 ${team} Matches`,
link: url,
item: list?.toArray().map((item) => {
@@ -43,5 +43,5 @@ module.exports = async (ctx) => {
guid: url + dateTime,
};
}),
- };
+ });
};
diff --git a/lib/v2/literotica/category.js b/lib/v2/literotica/category.js
index 839ffaa62b..34b07f3ea7 100644
--- a/lib/v2/literotica/category.js
+++ b/lib/v2/literotica/category.js
@@ -1,9 +1,9 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
- const category = ctx.params.category;
+ const category = ctx.req.param('category');
const rootUrl = 'https://www.literotica.com';
const currentUrl = `${rootUrl}/c/${category}`;
@@ -13,7 +13,7 @@ module.exports = async (ctx) => {
url: currentUrl,
});
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('.b-slb-item')
.map((_, item) => {
@@ -38,7 +38,7 @@ module.exports = async (ctx) => {
url: item.link,
});
- const content = cheerio.load(detailResponse.data);
+ const content = load(detailResponse.data);
item.description = content('.aa_ht').html();
@@ -47,9 +47,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: $('title').text(),
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/literotica/new.js b/lib/v2/literotica/new.js
index d6f45a5fa5..b3cc980338 100644
--- a/lib/v2/literotica/new.js
+++ b/lib/v2/literotica/new.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const rootUrl = 'https://www.literotica.com';
@@ -11,7 +11,7 @@ module.exports = async (ctx) => {
url: currentUrl,
});
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('.b-46t')
.map((_, item) => {
@@ -42,7 +42,7 @@ module.exports = async (ctx) => {
url: item.link,
});
- const content = cheerio.load(detailResponse.data);
+ const content = load(detailResponse.data);
item.description = content('.aa_ht').html();
@@ -51,9 +51,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: $('title').text(),
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/liulinblog/index.js b/lib/v2/liulinblog/index.js
index 9c75f614ab..80a965485b 100644
--- a/lib/v2/liulinblog/index.js
+++ b/lib/v2/liulinblog/index.js
@@ -1,17 +1,17 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const { params } = ctx.params;
- const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 20;
+ const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 20;
const rootUrl = 'https://www.liulinblog.com';
const currentUrl = params ? new URL(params, rootUrl).href : rootUrl;
const { data: response } = await got(currentUrl);
- const $ = cheerio.load(response);
+ const $ = load(response);
let items = $('div.scroll')
.first()
@@ -47,7 +47,7 @@ module.exports = async (ctx) => {
ctx.cache.tryGet(item.link, async () => {
const { data: detailResponse } = await got(item.link);
- const content = cheerio.load(detailResponse);
+ const content = load(detailResponse);
content('div[role="alert"]').remove();
@@ -83,7 +83,7 @@ module.exports = async (ctx) => {
const icon = $('link[rel="icon"]').prop('href');
const title = $('img.logo').prop('alt');
- ctx.state.data = {
+ ctx.set('data', {
item: items,
title: `${title} - ${params ? $('h1.term-title').text().split('搜索到')[0] : '最新'}`,
link: currentUrl,
@@ -94,5 +94,5 @@ module.exports = async (ctx) => {
logo: icon,
subtitle: $('p.term-description').text(),
author: title,
- };
+ });
};
diff --git a/lib/v2/liveuamap/index.js b/lib/v2/liveuamap/index.js
index 3f78594541..acfe8cf1bf 100644
--- a/lib/v2/liveuamap/index.js
+++ b/lib/v2/liveuamap/index.js
@@ -1,10 +1,10 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
const { isValidHost } = require('@/utils/valid-host');
module.exports = async (ctx) => {
- let region = ctx.params.region ?? 'ukraine';
- const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 50;
+ let region = ctx.req.param('region') ?? 'ukraine';
+ const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 50;
if (!isValidHost(region)) {
throw new Error('Invalid region');
}
@@ -19,7 +19,7 @@ module.exports = async (ctx) => {
method: 'get',
url,
});
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const items = $('div#feedler > div')
.slice(0, limit)
@@ -33,9 +33,9 @@ module.exports = async (ctx) => {
};
});
- ctx.state.data = {
+ ctx.set('data', {
title: `Liveuamap - ${region}`,
link: url,
item: items,
- };
+ });
};
diff --git a/lib/v2/lkong/forum.js b/lib/v2/lkong/forum.js
index 169decc9b8..99d419281e 100644
--- a/lib/v2/lkong/forum.js
+++ b/lib/v2/lkong/forum.js
@@ -1,13 +1,13 @@
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
const { viewForum, viewThread } = require('./query');
module.exports = async (ctx) => {
- const id = ctx.params.id ?? '8';
- const digest = ctx.params.digest;
+ const id = ctx.req.param('id') ?? '8';
+ const digest = ctx.req.param('digest');
const rootUrl = 'https://www.lkong.com';
const apiUrl = 'https://api.lkong.com/api';
@@ -46,10 +46,10 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: `${response.data.data.forum.name} - 龙空`,
link: currentUrl,
item: items,
description: response.data.data.forumCount.info,
- };
+ });
};
diff --git a/lib/v2/lkong/thread.js b/lib/v2/lkong/thread.js
index bd62125be2..fd90fd21a0 100644
--- a/lib/v2/lkong/thread.js
+++ b/lib/v2/lkong/thread.js
@@ -1,12 +1,12 @@
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
const { viewThread, countReplies } = require('./query');
module.exports = async (ctx) => {
- const id = ctx.params.id;
+ const id = ctx.req.param('id');
const rootUrl = 'https://www.lkong.com';
const apiUrl = 'https://api.lkong.com/api';
@@ -49,9 +49,9 @@ module.exports = async (ctx) => {
}),
}));
- ctx.state.data = {
+ ctx.set('data', {
title: `${response.data.data.thread.title} - 龙空`,
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/lofter/tag.js b/lib/v2/lofter/tag.js
index efff0bdb47..9a8584a4f8 100644
--- a/lib/v2/lofter/tag.js
+++ b/lib/v2/lofter/tag.js
@@ -1,11 +1,11 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
const { JSDOM } = require('jsdom');
module.exports = async (ctx) => {
- const name = ctx.params.name ?? '摄影';
- const type = ctx.params.type ?? 'new';
+ const name = ctx.req.param('name') ?? '摄影';
+ const type = ctx.req.param('type') ?? 'new';
const pageSize = 20;
const startingIndex = 0;
@@ -73,7 +73,7 @@ module.exports = async (ctx) => {
? JSON.parse(post.photoLinks).reduce((accumulator, currentValue) => accumulator + `
`, '') // small | middle | orign
: '';
- const digest = cheerio.load(post.digest);
+ const digest = load(post.digest);
const description = digest.text();
return {
@@ -86,9 +86,9 @@ module.exports = async (ctx) => {
};
});
- ctx.state.data = {
+ ctx.set('data', {
title: `${name} - ${title} | LOFTER`,
link: linkUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/lofter/user.js b/lib/v2/lofter/user.js
index fbd95c851a..8140ec9a16 100644
--- a/lib/v2/lofter/user.js
+++ b/lib/v2/lofter/user.js
@@ -1,10 +1,10 @@
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
const { isValidHost } = require('@/utils/valid-host');
module.exports = async (ctx) => {
- const name = ctx.params.name ?? 'i';
- const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : '50';
+ const name = ctx.req.param('name') ?? 'i';
+ const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : '50';
if (!isValidHost(name)) {
throw new Error('Invalid name');
}
@@ -52,10 +52,10 @@ module.exports = async (ctx) => {
category: item.post.tag.split(','),
}));
- ctx.state.data = {
+ ctx.set('data', {
title: `${items[0].author} | LOFTER`,
link: rootUrl,
item: items,
description: response.data.response.posts[0].post.blogInfo.selfIntro,
- };
+ });
};
diff --git a/lib/v2/logclub/index.js b/lib/v2/logclub/index.js
index e1fffcb883..0dc7eb971f 100644
--- a/lib/v2/logclub/index.js
+++ b/lib/v2/logclub/index.js
@@ -1,19 +1,19 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
module.exports = async (ctx) => {
const { category = 'news' } = ctx.params;
- const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 11;
+ const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 11;
const rootUrl = 'https://www.logclub.com';
const currentUrl = new URL(category, rootUrl).href;
const { data: response } = await got(currentUrl);
- const $ = cheerio.load(response);
+ const $ = load(response);
let items = $('li.layui-row, li.layui-timeline-item')
.slice(0, limit)
@@ -43,7 +43,7 @@ module.exports = async (ctx) => {
ctx.cache.tryGet(item.link, async () => {
const { data: detailResponse } = await got(item.link);
- const content = cheerio.load(detailResponse);
+ const content = load(detailResponse);
content('a.dl_file').each((_, el) => {
el = content(el);
@@ -116,7 +116,7 @@ module.exports = async (ctx) => {
const subtitle = $('meta[name="keywords"]').prop('content');
const author = subtitle.split(/,/)[0];
- ctx.state.data = {
+ ctx.set('data', {
item: items,
title: $('title').text().split(/-/)[0].trim(),
link: currentUrl,
@@ -129,5 +129,5 @@ module.exports = async (ctx) => {
author,
itunes_author: author,
itunes_category: 'News',
- };
+ });
};
diff --git a/lib/v2/logclub/report.js b/lib/v2/logclub/report.js
index 0375a7835b..5ac3842804 100644
--- a/lib/v2/logclub/report.js
+++ b/lib/v2/logclub/report.js
@@ -1,13 +1,13 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const timezone = require('@/utils/timezone');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import timezone from '@/utils/timezone';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
module.exports = async (ctx) => {
const { id = 'Report' } = ctx.params;
- const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 11;
+ const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 11;
const rootUrl = 'https://www.logclub.com';
const currentUrl = new URL('lc_report', rootUrl).href;
@@ -39,7 +39,7 @@ module.exports = async (ctx) => {
ctx.cache.tryGet(item.link, async () => {
const { data: detailResponse } = await got(item.link);
- const content = cheerio.load(detailResponse);
+ const content = load(detailResponse);
content('img').each((_, el) => {
el = content(el);
@@ -77,13 +77,13 @@ module.exports = async (ctx) => {
const { data: currentResponse } = await got(currentUrl);
- const $ = cheerio.load(currentResponse);
+ const $ = load(currentResponse);
const title = $('div.this_nav').text().trim();
const icon = new URL($('link[rel="shortcut icon"]').prop('href'), rootUrl).href;
const subtitle = $('meta[name="keywords"]').prop('content');
- ctx.state.data = {
+ ctx.set('data', {
item: items,
title: `${$('title').text()}${title}`,
link: currentUrl,
@@ -94,5 +94,5 @@ module.exports = async (ctx) => {
logo: icon,
subtitle: subtitle.replaceAll(',', ''),
author: subtitle.split(/,/)[0],
- };
+ });
};
diff --git a/lib/v2/logonews/index.js b/lib/v2/logonews/index.js
index be80e9c628..f2a5d40ce1 100644
--- a/lib/v2/logonews/index.js
+++ b/lib/v2/logonews/index.js
@@ -1,7 +1,7 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
module.exports = async (ctx) => {
@@ -16,10 +16,10 @@ module.exports = async (ctx) => {
url: currentUrl,
});
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
let items = $(isWork ? 'h2 a' : 'a.article-link')
- .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 25)
+ .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 25)
.toArray()
.map((item) => {
item = $(item);
@@ -37,7 +37,7 @@ module.exports = async (ctx) => {
url: item.link,
});
- const content = cheerio.load(detailResponse.data);
+ const content = load(detailResponse.data);
content('.iconfont').remove();
@@ -68,9 +68,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: $('title').text(),
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/loltw/news.js b/lib/v2/loltw/news.js
index 00c54d79e1..e186a0c019 100644
--- a/lib/v2/loltw/news.js
+++ b/lib/v2/loltw/news.js
@@ -1,10 +1,10 @@
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
module.exports = async (ctx) => {
- const category = ctx.params.category ?? '';
+ const category = ctx.req.param('category') ?? '';
const baseUrl = 'https://lol.garena.tw';
@@ -28,9 +28,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: '英雄联盟 - 台服新闻',
link: category ? `${baseUrl}/news/${category}` : `${baseUrl}/news`,
item: items,
- };
+ });
};
diff --git a/lib/v2/lovelive-anime/news.js b/lib/v2/lovelive-anime/news.js
index ec9c987e33..e011390042 100644
--- a/lib/v2/lovelive-anime/news.js
+++ b/lib/v2/lovelive-anime/news.js
@@ -1,7 +1,7 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
const path = require('path');
-const { art } = require('@/utils/render');
+import { art } from '@/utils/render';
const renderDescription = (desc) => art(path.join(__dirname, 'templates/description.art'), desc);
module.exports = async (ctx) => {
@@ -9,7 +9,7 @@ module.exports = async (ctx) => {
const response = await got(rootUrl);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const pageFace = $('div.c-card.p-colum__box')
.map((_, item) => {
@@ -30,12 +30,12 @@ module.exports = async (ctx) => {
let items = pageFace;
- if (ctx.params.option === 'detail') {
+ if (ctx.req.param('option') === 'detail') {
items = await Promise.all(
pageFace.map((item) =>
ctx.cache.tryGet(item.link, async () => {
const detailResp = await got(item.link);
- const $ = cheerio.load(detailResp.data);
+ const $ = load(detailResp.data);
const content = $('div.p-page__detail.p-article');
for (const v of content.find('img')) {
@@ -48,9 +48,9 @@ module.exports = async (ctx) => {
);
}
- ctx.state.data = {
+ ctx.set('data', {
title: 'lovelive official website news',
link: 'https://www.lovelive-anime.jp/news/',
item: items,
- };
+ });
};
diff --git a/lib/v2/lovelive-anime/schedules.js b/lib/v2/lovelive-anime/schedules.js
index 93193958ab..3bc79cc856 100644
--- a/lib/v2/lovelive-anime/schedules.js
+++ b/lib/v2/lovelive-anime/schedules.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
const path = require('path');
-const { art } = require('@/utils/render');
+import { art } from '@/utils/render';
const renderDescription = (desc) => art(path.join(__dirname, 'templates/scheduleDesc.art'), desc);
const dayjs = require('dayjs');
const utc = require('dayjs/plugin/utc');
@@ -9,8 +9,8 @@ const timezone = require('dayjs/plugin/timezone');
module.exports = async (ctx) => {
dayjs.extend(utc);
dayjs.extend(timezone);
- const serie = ctx.params.serie;
- const category = ctx.params.category;
+ const serie = ctx.req.param('serie');
+ const category = ctx.req.param('category');
const rootUrl = `https://www.lovelive-anime.jp/common/api/calendar_list.php`;
const nowTime = dayjs();
const dataPara = {
@@ -46,11 +46,11 @@ module.exports = async (ctx) => {
};
});
- ctx.state.data = {
+ ctx.set('data', {
title: `${category} - ${serie} - Love Live Official Website Schedule`,
link: 'https://www.lovelive-anime.jp/schedule/',
item: items,
description:
'The schedule date and other information shall be subject to the announcement on the official website. The RSS route has not been strictly tested, and the captured information cannot be guaranteed to be correct.',
- };
+ });
};
diff --git a/lib/v2/lovelive-anime/topics.js b/lib/v2/lovelive-anime/topics.js
index 2feb9dca58..11208f9336 100644
--- a/lib/v2/lovelive-anime/topics.js
+++ b/lib/v2/lovelive-anime/topics.js
@@ -1,12 +1,12 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
const path = require('path');
-const { art } = require('@/utils/render');
-const { parseDate } = require('@/utils/parse-date');
+import { art } from '@/utils/render';
+import { parseDate } from '@/utils/parse-date';
const renderDescription = (desc) => art(path.join(__dirname, 'templates/description.art'), desc);
module.exports = async (ctx) => {
- const abbr = ctx.params.abbr;
+ const abbr = ctx.req.param('abbr');
const rootUrl = `https://www.lovelive-anime.jp/${abbr}`;
const topicsUrlPart = 'yuigaoka' === abbr ? 'topics/' : 'topics.php';
const baseUrl = `${rootUrl}/${'yuigaoka' === abbr ? 'topics/' : ''}`;
@@ -17,11 +17,11 @@ module.exports = async (ctx) => {
yuigaoka: 'スーパースター!!',
};
- const url = Object.hasOwn(ctx.params, 'category') && ctx.params.category !== 'detail' ? `${rootUrl}/${topicsUrlPart}?cat=${ctx.params.category}` : `${rootUrl}/${topicsUrlPart}`;
+ const url = Object.hasOwn(ctx.params, 'category') && ctx.req.param('category') !== 'detail' ? `${rootUrl}/${topicsUrlPart}?cat=${ctx.req.param('category')}` : `${rootUrl}/${topicsUrlPart}`;
const response = await got(url);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const categoryName = 'uranohoshi' === abbr ? $('div.llbox > p').text() : $('div.category_title > h2').text();
@@ -53,12 +53,12 @@ module.exports = async (ctx) => {
})
.get();
- if (ctx.params.option === 'detail' || ctx.params.category === 'detail') {
+ if (ctx.req.param('option') === 'detail' || ctx.req.param('category') === 'detail') {
items = await Promise.all(
items.map((item) =>
ctx.cache.tryGet(item.link, async () => {
const detailResp = await got(item.link);
- const $ = cheerio.load(detailResp.data);
+ const $ = load(detailResp.data);
const content = $('div.p-page__detail.p-article');
for (const v of content.find('img')) {
@@ -71,9 +71,9 @@ module.exports = async (ctx) => {
);
}
- ctx.state.data = {
+ ctx.set('data', {
title: `${categoryName} - ${abbrDetail[abbr]} - Love Live Official Website Topics`,
link: url,
item: items,
- };
+ });
};
diff --git a/lib/v2/lsnu/jiaowc/tzgg.js b/lib/v2/lsnu/jiaowc/tzgg.js
index ce0b59d005..42cfc7f4a9 100644
--- a/lib/v2/lsnu/jiaowc/tzgg.js
+++ b/lib/v2/lsnu/jiaowc/tzgg.js
@@ -1,8 +1,8 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
module.exports = async (ctx) => {
- const category = ctx.params.category;
+ const category = ctx.req.param('category');
const url = category ? `https://jiaowc.lsnu.edu.cn/tzgg/${category}.htm` : 'https://jiaowc.lsnu.edu.cn/tzgg.htm';
const response = await got({
@@ -12,12 +12,12 @@ module.exports = async (ctx) => {
const data = response.data;
- const $ = cheerio.load(data);
+ const $ = load(data);
const list = $('tr[id^="line_u5_"]').get();
const out = await Promise.all(
list.map(async (item) => {
- const $ = cheerio.load(item);
+ const $ = load(item);
const title = $('a').attr('title');
const link = `https://jiaowc.lsnu.edu.cn/${$('a').attr('href')}`;
const date = $('td[width="80"]').text();
@@ -29,7 +29,7 @@ module.exports = async (ctx) => {
});
const articleData = response.data;
- const article$ = cheerio.load(articleData);
+ const article$ = load(articleData);
const description = article$('.v_news_content').html();
return {
@@ -44,9 +44,9 @@ module.exports = async (ctx) => {
})
);
- ctx.state.data = {
+ ctx.set('data', {
title: '乐山师范学院教学部通知公告',
link: 'https://jiaowc.lsnu.edu.cn/tzgg.htm',
item: out,
- };
+ });
};
diff --git a/lib/v2/luogu/contest.js b/lib/v2/luogu/contest.js
index 86ba719af0..48793aedca 100644
--- a/lib/v2/luogu/contest.js
+++ b/lib/v2/luogu/contest.js
@@ -1,7 +1,8 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const md = require('markdown-it')();
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import MarkdownIt from 'markdown-it';
+const md = MarkdownIt();
const asyncPool = require('tiny-async-pool');
const baseUrl = 'https://www.luogu.com.cn';
@@ -27,7 +28,7 @@ const typeMap = {
module.exports = async (ctx) => {
const link = `${baseUrl}/contest/list`;
const { data: response } = await got(link);
- const $ = cheerio.load(response);
+ const $ = load(response);
const data = JSON.parse(
decodeURIComponent(
@@ -41,7 +42,7 @@ module.exports = async (ctx) => {
for await (const item of asyncPool(4, data.currentData.contests.result, (item) =>
ctx.cache.tryGet(`${baseUrl}/contest/${item.id}`, async () => {
const { data: response } = await got(`${baseUrl}/contest/${item.id}`);
- const $ = cheerio.load(response);
+ const $ = load(response);
const data = JSON.parse(
decodeURIComponent(
$('script')
@@ -63,10 +64,10 @@ module.exports = async (ctx) => {
result.push(item);
}
- ctx.state.data = {
+ ctx.set('data', {
title: $('head title').text(),
link,
image: 'https://www.luogu.com.cn/favicon.ico',
item: result,
- };
+ });
};
diff --git a/lib/v2/luogu/daily.js b/lib/v2/luogu/daily.js
index 4e8afb5a3e..2cf26bb0d4 100644
--- a/lib/v2/luogu/daily.js
+++ b/lib/v2/luogu/daily.js
@@ -1,12 +1,12 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
- const id = ctx.params.id ?? 47327;
+ const id = ctx.req.param('id') ?? 47327;
const link = `https://www.luogu.com.cn/discuss/${id}`;
const response = await got(link);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const title = $('head title').text();
const injectionScript = $('head script:contains("window._feInjection")').text();
@@ -17,7 +17,7 @@ module.exports = async (ctx) => {
const dailyLink = mdRaw.match(/<([^>]*)>/)[1];
const { data: dailyResponse } = await got(dailyLink);
- const $daily = cheerio.load(dailyResponse);
+ const $daily = load(dailyResponse);
const issueHeading = $daily('.am-article-title').first().text().trim();
const item = [
{
@@ -30,9 +30,9 @@ module.exports = async (ctx) => {
},
];
- ctx.state.data = {
+ ctx.set('data', {
title: '洛谷日报',
link,
item,
- };
+ });
};
diff --git a/lib/v2/luogu/user-blog.js b/lib/v2/luogu/user-blog.js
index b488d4a318..bdd828da7f 100644
--- a/lib/v2/luogu/user-blog.js
+++ b/lib/v2/luogu/user-blog.js
@@ -1,15 +1,15 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
module.exports = async (ctx) => {
- const name = ctx.params.name;
+ const name = ctx.req.param('name');
const blogBaseUrl = `https://www.luogu.com.cn/blog/${name}/`;
// Fetch the uid & title
const { uid: blogUid, title: blogTitle } = await ctx.cache.tryGet(blogBaseUrl, async () => {
const rsp = await got(blogBaseUrl);
- const $ = cheerio.load(rsp.data);
+ const $ = load(rsp.data);
const uid = $("meta[name='blog-uid']").attr('content');
const name = $("meta[name='blog-name']").attr('content');
return {
@@ -29,7 +29,7 @@ module.exports = async (ctx) => {
posts.map((post) =>
ctx.cache.tryGet(post.link, async () => {
const rsp = await got(post.link);
- const $ = cheerio.load(rsp.data);
+ const $ = load(rsp.data);
return {
title: post.title,
link: post.link,
@@ -40,9 +40,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: blogTitle,
link: blogBaseUrl,
item,
- };
+ });
};
diff --git a/lib/v2/luogu/user-feed.js b/lib/v2/luogu/user-feed.js
index 5a7f19cfb3..c999d8526c 100644
--- a/lib/v2/luogu/user-feed.js
+++ b/lib/v2/luogu/user-feed.js
@@ -1,6 +1,7 @@
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
-const md = require('markdown-it')();
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
+import MarkdownIt from 'markdown-it';
+const md = MarkdownIt();
module.exports = async (ctx) => {
const getUsernameFromUID = (uid) =>
@@ -9,13 +10,13 @@ module.exports = async (ctx) => {
return data.currentData.user.name;
});
- const uid = ctx.params.uid;
+ const uid = ctx.req.param('uid');
const name = await getUsernameFromUID(uid);
const { data: response } = await got(`https://www.luogu.com.cn/api/feed/list?user=${uid}`);
const data = response.feeds.result;
- ctx.state.data = {
+ ctx.set('data', {
title: `${name} 的洛谷动态`,
link: `https://www.luogu.com.cn/user/${uid}#activity`,
allowEmpty: true,
@@ -27,5 +28,5 @@ module.exports = async (ctx) => {
link: `https://www.luogu.com.cn/user/${uid}#activity`,
guid: item.id,
})),
- };
+ });
};
diff --git a/lib/v2/luxiangdong/archive.js b/lib/v2/luxiangdong/archive.js
index b0996d7112..b05c7ce784 100644
--- a/lib/v2/luxiangdong/archive.js
+++ b/lib/v2/luxiangdong/archive.js
@@ -1,5 +1,5 @@
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const { data } = await got(`https://www.luxiangdong.com/content.json?t=${Date.now()}`);
@@ -17,12 +17,12 @@ module.exports = async (ctx) => {
category: item.tags.map((tag) => tag.name),
}));
- ctx.state.data = {
+ ctx.set('data', {
// 源标题
title: '土猛的员外',
// 源链接
link: 'https://www.luxiangdong.com/',
// 源文章
item: items,
- };
+ });
};
diff --git a/lib/v2/lvv2/news.js b/lib/v2/lvv2/news.js
index 0fb5a57210..1e0cea5e35 100644
--- a/lib/v2/lvv2/news.js
+++ b/lib/v2/lvv2/news.js
@@ -1,8 +1,8 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
-const timezone = require('@/utils/timezone');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import timezone from '@/utils/timezone';
+import { art } from '@/utils/render';
const path = require('path');
const rootUrl = 'https://lvv2.com';
@@ -25,12 +25,12 @@ const titleMap = {
};
module.exports = async (ctx) => {
- const channel = ctx.params.channel;
- const sort = (channel === 'sort-realtime' || channel === 'sort-score') && !ctx.params.sort ? 't-week' : ctx.params.sort;
+ const channel = ctx.req.param('channel');
+ const sort = (channel === 'sort-realtime' || channel === 'sort-score') && !ctx.req.param('sort') ? 't-week' : ctx.req.param('sort');
const url = `${rootUrl}/${channel}/${sort}`;
const response = await got(url);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('div.spacer > div')
.map((_, item) => ({
title: $(item).find('h3 > a.title').text().trim(),
@@ -48,7 +48,7 @@ module.exports = async (ctx) => {
new URL(item.link).hostname === 'instant.lvv2.com'
? await ctx.cache.tryGet(item.link, async () => {
const articleResponse = await got(item.link);
- const article = cheerio.load(articleResponse.data);
+ const article = load(articleResponse.data);
const description = article('#_tl_editor')
.html()
@@ -66,9 +66,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: `lvv2 - ${sort ? titleMap[channel][sort] : titleMap[channel]}`,
link: url,
item: items,
- };
+ });
};
diff --git a/lib/v2/lvv2/top.js b/lib/v2/lvv2/top.js
index 416bab1614..f664f01e1b 100644
--- a/lib/v2/lvv2/top.js
+++ b/lib/v2/lvv2/top.js
@@ -1,8 +1,8 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
-const timezone = require('@/utils/timezone');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import timezone from '@/utils/timezone';
+import { art } from '@/utils/render';
const path = require('path');
const rootUrl = 'https://lvv2.com';
@@ -25,12 +25,12 @@ const titleMap = {
};
module.exports = async (ctx) => {
- const channel = ctx.params.channel;
- const sort = (channel === 'sort-realtime' || channel === 'sort-score') && !ctx.params.sort ? 't-week' : ctx.params.sort;
+ const channel = ctx.req.param('channel');
+ const sort = (channel === 'sort-realtime' || channel === 'sort-score') && !ctx.req.param('sort') ? 't-week' : ctx.req.param('sort');
const url = `${rootUrl}/${channel}/${sort}`;
const response = await got(url);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('#top-content-news > div')
.map((_, item) => ({
title: $(item).find('div.md > a').text(),
@@ -42,7 +42,7 @@ module.exports = async (ctx) => {
list.map((item) =>
ctx.cache.tryGet(item.link, async () => {
const detailResponse = await got.get(item.link);
- const content = cheerio.load(detailResponse.data);
+ const content = load(detailResponse.data);
item.pubDate = timezone(parseDate(content('time').attr('datetime')), +8);
item.author = content('a.author').text();
@@ -51,7 +51,7 @@ module.exports = async (ctx) => {
new URL(link, item.link).hostname === 'instant.lvv2.com'
? await ctx.cache.tryGet(link, async () => {
const articleResponse = await got(link);
- const article = cheerio.load(articleResponse.data);
+ const article = load(articleResponse.data);
const description = article('#_tl_editor')
.html()
@@ -68,9 +68,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: `lvv2 - ${sort ? titleMap[channel][sort] : titleMap[channel]} 24小时点击 Top 10`,
link: url,
item: items,
- };
+ });
};
diff --git a/lib/v2/lxixsxa/discography.js b/lib/v2/lxixsxa/discography.js
index 34f94eedfe..aa2ed23dd4 100644
--- a/lib/v2/lxixsxa/discography.js
+++ b/lib/v2/lxixsxa/discography.js
@@ -1,7 +1,7 @@
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
const { parseJSONP } = require('./jsonp-helper');
-const { art } = require('@/utils/render');
+import { art } from '@/utils/render';
const path = require('path');
module.exports = async (ctx) => {
@@ -26,7 +26,7 @@ module.exports = async (ctx) => {
comment: item.catch_copy === '' ? '今日もいい日だ！' : item.catch_copy,
}));
- ctx.state.data = {
+ ctx.set('data', {
// the source title
title,
// the source url
@@ -50,5 +50,5 @@ module.exports = async (ctx) => {
// the article link
link: `${url}/${item.referID}`,
})),
- };
+ });
};
diff --git a/lib/v2/lxixsxa/information.js b/lib/v2/lxixsxa/information.js
index bb80dee646..9d1e5d0b8b 100644
--- a/lib/v2/lxixsxa/information.js
+++ b/lib/v2/lxixsxa/information.js
@@ -1,7 +1,7 @@
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
const { parseJSONP } = require('./jsonp-helper');
-const { art } = require('@/utils/render');
+import { art } from '@/utils/render';
const path = require('path');
module.exports = async (ctx) => {
@@ -23,7 +23,7 @@ module.exports = async (ctx) => {
description: item.article,
}));
- ctx.state.data = {
+ ctx.set('data', {
// the source title
title,
// the source url
@@ -44,5 +44,5 @@ module.exports = async (ctx) => {
// the article link
link: `${url}/${item.id}`,
})),
- };
+ });
};
diff --git a/lib/v2/m4/index.js b/lib/v2/m4/index.js
index ec63c69461..b5da74ed1a 100644
--- a/lib/v2/m4/index.js
+++ b/lib/v2/m4/index.js
@@ -1,20 +1,20 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const timezone = require('@/utils/timezone');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import timezone from '@/utils/timezone';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
module.exports = async (ctx) => {
const { id = 'news', category = 'china' } = ctx.params;
- const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 30;
+ const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 30;
const rootUrl = `http://${id}.m4.cn`;
const currentUrl = new URL(category ? `/${category.replace(/\/$/, '')}/` : '/', rootUrl).href;
const { data: response } = await got(currentUrl);
- const $ = cheerio.load(response);
+ const $ = load(response);
let items = $('div.articleitem0 div.aheader0')
.slice(0, limit)
@@ -48,7 +48,7 @@ module.exports = async (ctx) => {
ctx.cache.tryGet(item.link, async () => {
const { data: detailResponse } = await got(item.link);
- const content = cheerio.load(detailResponse);
+ const content = load(detailResponse);
item.title = content('h1').first().text();
item.description = art(path.join(__dirname, 'templates/description.art'), {
@@ -68,7 +68,7 @@ module.exports = async (ctx) => {
const image = $('a.logo0_b img').prop('src');
- ctx.state.data = {
+ ctx.set('data', {
item: items,
title: $('title').text(),
link: currentUrl,
@@ -78,5 +78,5 @@ module.exports = async (ctx) => {
subtitle: $('meta[name="keywords"]').prop('content'),
author: $('meta[name="author"]').prop('content'),
allowEmpty: true,
- };
+ });
};
diff --git a/lib/v2/macfilos/blog.js b/lib/v2/macfilos/blog.js
index 2d20bf5ba3..37175906c7 100644
--- a/lib/v2/macfilos/blog.js
+++ b/lib/v2/macfilos/blog.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const rootUrl = 'https://www.macfilos.com';
@@ -11,10 +11,10 @@ module.exports = async (ctx) => {
url: currentUrl,
});
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
let items = $('.entry-title a')
- .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 10)
+ .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 10)
.toArray()
.map((item) => {
item = $(item);
@@ -37,7 +37,7 @@ module.exports = async (ctx) => {
url: item.link,
});
- const content = cheerio.load(detailResponse.data);
+ const content = load(detailResponse.data);
content('hr').nextAll().remove();
content('hr').remove();
@@ -53,9 +53,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: $('title').text(),
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/macmenubar/recently.js b/lib/v2/macmenubar/recently.js
index 15b6d4123c..1a184da05f 100644
--- a/lib/v2/macmenubar/recently.js
+++ b/lib/v2/macmenubar/recently.js
@@ -1,4 +1,4 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
async function getCategoryId(categories) {
const baseUrl = `https://macmenubar.com/wp-json/wp/v2/categories`;
@@ -13,7 +13,7 @@ async function getCategoryId(categories) {
module.exports = async (ctx) => {
const baseUrl = 'https://macmenubar.com/wp-json/wp/v2/posts';
- const categories = ctx.params.category;
+ const categories = ctx.req.param('category');
const searchParams = {
per_page: 100,
};
@@ -39,9 +39,9 @@ module.exports = async (ctx) => {
category: [...tags, ...categories],
};
});
- ctx.state.data = {
+ ctx.set('data', {
title: 'Recent Posts | MacMenuBar.com',
link: 'https://macmenubar.com/recently-added/',
item: items,
- };
+ });
};
diff --git a/lib/v2/macupdate/app.js b/lib/v2/macupdate/app.js
index 9260f4b114..58d4a50117 100644
--- a/lib/v2/macupdate/app.js
+++ b/lib/v2/macupdate/app.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const { appId, appSlug } = ctx.params;
@@ -8,7 +8,7 @@ module.exports = async (ctx) => {
const link = `${baseUrl}/app/mac/${appId}${appSlug ? `/${appSlug}` : ''}`;
const { data: response } = await got(link);
- const $ = cheerio.load(response);
+ const $ = load(response);
const nextData = JSON.parse($('#__NEXT_DATA__').text());
@@ -27,7 +27,7 @@ module.exports = async (ctx) => {
author: appData.developer.name,
};
- ctx.state.data = {
+ ctx.set('data', {
title: appData.title,
description: appData.description,
link: `${baseUrl}${asPath}`,
@@ -35,9 +35,9 @@ module.exports = async (ctx) => {
icon: appData.logo.source,
item: [item],
language: 'en',
- };
+ });
- ctx.state.json = {
+ ctx.set('json', {
pageProps: nextData.props.initialProps.pageProps,
- };
+ });
};
diff --git a/lib/v2/magazinelib/latest-magazine.js b/lib/v2/magazinelib/latest-magazine.js
index cbf26df4e4..5372286fab 100644
--- a/lib/v2/magazinelib/latest-magazine.js
+++ b/lib/v2/magazinelib/latest-magazine.js
@@ -1,11 +1,11 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { art } from '@/utils/render';
const path = require('path');
const host = 'https://magazinelib.com';
module.exports = async (ctx) => {
- const query = ctx.params.query;
+ const query = ctx.req.param('query');
const url = `${host}/wp-json/wp/v2/posts/`;
const response = await got({
method: 'get',
@@ -30,7 +30,7 @@ module.exports = async (ctx) => {
data.link = obj.link;
data.featuredMediaLink = obj._links['wp:featuredmedia'][0].href;
data.title = obj.title.rendered;
- const $ = cheerio.load(obj.content.rendered);
+ const $ = load(obj.content.rendered);
const content = $('.vk-att');
content.find('img[src="https://magazinelib.com/wp-includes/images/media/default.png"]').remove();
data.content = content.html();
@@ -40,7 +40,7 @@ module.exports = async (ctx) => {
return data;
});
- ctx.state.data = {
+ ctx.set('data', {
title: `MagazineLib - Latest Magazines${subTitle}`,
link: `{host}/?s=${query}`,
description: `MagazineLib - Latest Magazines${subTitle}`,
@@ -51,5 +51,5 @@ module.exports = async (ctx) => {
pubDate: new Date(item.pubDate).toUTCString(),
description: item.description,
})),
- };
+ });
};
diff --git a/lib/v2/mail/imap.js b/lib/v2/mail/imap.js
index 433c6b7c9f..55ffe9ad75 100644
--- a/lib/v2/mail/imap.js
+++ b/lib/v2/mail/imap.js
@@ -1,8 +1,8 @@
const { ImapFlow } = require('imapflow');
-const config = require('@/config').value;
+import { config } from '@/config';
const { simpleParser } = require('mailparser');
const logger = require('@/utils/logger');
-const { parseDate } = require('@/utils/parse-date');
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const { email, folder = 'INBOX' } = ctx.params;
@@ -90,10 +90,10 @@ module.exports = async (ctx) => {
await client.logout();
- ctx.state.data = {
+ ctx.set('data', {
title: `${email}'s Inbox${folder === 'INBOX' ? '' : ` - ${folder}`}`,
link: `https://${email.split('@')[1]}`,
item: items,
allowEmpty: true,
- };
+ });
};
diff --git a/lib/v2/mangadex/index.js b/lib/v2/mangadex/index.js
index 0791296e58..db5c970eac 100644
--- a/lib/v2/mangadex/index.js
+++ b/lib/v2/mangadex/index.js
@@ -1,5 +1,5 @@
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
const { RequestInProgressError } = require('@/errors');
module.exports = async (ctx) => {
@@ -44,7 +44,7 @@ module.exports = async (ctx) => {
if (data.result === 'error') {
throw new RequestInProgressError(data.errors[0].detail);
}
- ctx.state.data = {
+ ctx.set('data', {
title: `${title} - MangaDex`,
link: `https://mangadex.org/title/${id}`,
description,
@@ -66,7 +66,7 @@ module.exports = async (ctx) => {
pubDate: parseDate(chapter.attributes.publishAt),
};
}),
- };
+ });
if (lang) {
ctx.state.data.language = lang;
}
diff --git a/lib/v2/manhuagui/comic.js b/lib/v2/manhuagui/comic.js
index 9492a767f4..2058595e9f 100644
--- a/lib/v2/manhuagui/comic.js
+++ b/lib/v2/manhuagui/comic.js
@@ -1,7 +1,7 @@
-const cheerio = require('cheerio');
-const got = require('@/utils/got');
+import { load } from 'cheerio';
+import got from '@/utils/got';
const LZString = require('lz-string');
-const { parseDate } = require('@/utils/parse-date');
+import { parseDate } from '@/utils/parse-date';
let baseUrl = '';
@@ -53,9 +53,9 @@ module.exports = async (ctx) => {
baseUrl = 'https://www.manhuagui.com';
}
- const chapterCnt = Number(ctx.params.chapterCnt || 0);
+ const chapterCnt = Number(ctx.req.param('chapterCnt') || 0);
const { data } = await got(`${baseUrl}/comic/${id}/`);
- const $ = cheerio.load(data);
+ const $ = load(data);
if ($('#__VIEWSTATE').length > 0) {
const n = LZString.decompressFromBase64($('#__VIEWSTATE').val());
diff --git a/lib/v2/manhuagui/subscribe.js b/lib/v2/manhuagui/subscribe.js
index 2671650c73..420b9ead90 100644
--- a/lib/v2/manhuagui/subscribe.js
+++ b/lib/v2/manhuagui/subscribe.js
@@ -1,9 +1,9 @@
-const got = require('@/utils/got');
-const { parseRelativeDate } = require('@/utils/parse-date');
-const cheerio = require('cheerio');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { parseRelativeDate } from '@/utils/parse-date';
+import { load } from 'cheerio';
+import { art } from '@/utils/render';
const path = require('path');
-const config = require('@/config').value;
+import { config } from '@/config';
const web_url = 'https://www.manhuagui.com/user/book/shelf/1';
module.exports = async (ctx) => {
@@ -18,7 +18,7 @@ module.exports = async (ctx) => {
Cookie: cookie,
},
});
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const user_name = $('.avatar-box').find('h3').text();
const title = `${user_name} 的 漫画订阅`;
const link = web_url;
@@ -45,10 +45,10 @@ module.exports = async (ctx) => {
return single;
})
.get(); // 这里获取数组= =
- ctx.state.data = {
+ ctx.set('data', {
title,
link,
description,
item,
- };
+ });
};
diff --git a/lib/v2/mastodon/account-id.js b/lib/v2/mastodon/account-id.js
index 5c197b8700..b7f998ea66 100644
--- a/lib/v2/mastodon/account-id.js
+++ b/lib/v2/mastodon/account-id.js
@@ -1,21 +1,21 @@
const utils = require('./utils');
-const config = require('@/config').value;
+import { config } from '@/config';
module.exports = async (ctx) => {
- const site = ctx.params.site;
- const account_id = ctx.params.account_id;
- const only_media = ctx.params.only_media ? 'true' : 'false';
+ const site = ctx.req.param('site');
+ const account_id = ctx.req.param('account_id');
+ const only_media = ctx.req.param('only_media') ? 'true' : 'false';
if (!config.feature.allow_user_supply_unsafe_domain && !utils.allowSiteList.includes(site)) {
- ctx.throw(403, `This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`);
+ throw new Error(`This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`);
}
const { account_data, data } = await utils.getAccountStatuses(site, account_id, only_media);
- ctx.state.data = {
+ ctx.set('data', {
title: `${account_data.display_name} (@${account_data.acct})`,
link: account_data.url,
description: account_data.note,
item: utils.parseStatuses(data),
allowEmpty: true,
- };
+ });
};
diff --git a/lib/v2/mastodon/acct.js b/lib/v2/mastodon/acct.js
index 660ae06879..2f6ff70709 100644
--- a/lib/v2/mastodon/acct.js
+++ b/lib/v2/mastodon/acct.js
@@ -1,18 +1,18 @@
const utils = require('./utils');
module.exports = async (ctx) => {
- const acct = ctx.params.acct;
- const only_media = ctx.params.only_media ? 'true' : 'false';
+ const acct = ctx.req.param('acct');
+ const only_media = ctx.req.param('only_media') ? 'true' : 'false';
const { site, account_id } = await utils.getAccountIdByAcct(acct, ctx);
const { account_data, data } = await utils.getAccountStatuses(site, account_id, only_media);
- ctx.state.data = {
+ ctx.set('data', {
title: `${account_data.display_name} (@${account_data.acct})`,
link: account_data.url,
description: account_data.note,
item: utils.parseStatuses(data),
allowEmpty: true,
- };
+ });
};
diff --git a/lib/v2/mastodon/timeline-local.js b/lib/v2/mastodon/timeline-local.js
index abbdd458bf..d7adb19919 100644
--- a/lib/v2/mastodon/timeline-local.js
+++ b/lib/v2/mastodon/timeline-local.js
@@ -1,12 +1,12 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
const utils = require('./utils');
-const config = require('@/config').value;
+import { config } from '@/config';
module.exports = async (ctx) => {
- const site = ctx.params.site;
- const only_media = ctx.params.only_media ? 'true' : 'false';
+ const site = ctx.req.param('site');
+ const only_media = ctx.req.param('only_media') ? 'true' : 'false';
if (!config.feature.allow_user_supply_unsafe_domain && !utils.allowSiteList.includes(site)) {
- ctx.throw(403, `This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`);
+ throw new Error(`This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`);
}
const url = `http://${site}/api/v1/timelines/public?local=true&only_media=${only_media}`;
@@ -14,9 +14,9 @@ module.exports = async (ctx) => {
const response = await got.get(url);
const list = response.data;
- ctx.state.data = {
- title: `Local Public${ctx.params.only_media ? ' Media' : ''} Timeline on ${site}`,
+ ctx.set('data', {
+ title: `Local Public${ctx.req.param('only_media') ? ' Media' : ''} Timeline on ${site}`,
link: `https://${site}`,
item: utils.parseStatuses(list),
- };
+ });
};
diff --git a/lib/v2/mastodon/timeline-remote.js b/lib/v2/mastodon/timeline-remote.js
index 67ae65543b..cb1deeb9fc 100644
--- a/lib/v2/mastodon/timeline-remote.js
+++ b/lib/v2/mastodon/timeline-remote.js
@@ -1,12 +1,12 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
const utils = require('./utils');
-const config = require('@/config').value;
+import { config } from '@/config';
module.exports = async (ctx) => {
- const site = ctx.params.site;
- const only_media = ctx.params.only_media ? 'true' : 'false';
+ const site = ctx.req.param('site');
+ const only_media = ctx.req.param('only_media') ? 'true' : 'false';
if (!config.feature.allow_user_supply_unsafe_domain && !utils.allowSiteList.includes(site)) {
- ctx.throw(403, `This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`);
+ throw new Error(`This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`);
}
const url = `http://${site}/api/v1/timelines/public?remote=true&only_media=${only_media}`;
@@ -14,9 +14,9 @@ module.exports = async (ctx) => {
const response = await got.get(url);
const list = response.data;
- ctx.state.data = {
- title: `Federated Public${ctx.params.only_media ? ' Media' : ''} Timeline on ${site}`,
+ ctx.set('data', {
+ title: `Federated Public${ctx.req.param('only_media') ? ' Media' : ''} Timeline on ${site}`,
link: `https://${site}`,
item: utils.parseStatuses(list),
- };
+ });
};
diff --git a/lib/v2/mastodon/utils.js b/lib/v2/mastodon/utils.js
index 692a1abb33..6d8b423161 100644
--- a/lib/v2/mastodon/utils.js
+++ b/lib/v2/mastodon/utils.js
@@ -1,5 +1,6 @@
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
+import { config } from '@/config';
const allowSiteList = ['mastodon.social', 'pawoo.net'];
@@ -76,7 +77,6 @@ async function getAccountStatuses(site, account_id, only_media) {
}
async function getAccountIdByAcct(acct, ctx) {
- const config = require('@/config').value;
const mastodonConfig = config.mastodon;
// acctHost is from the acct param of the request, and acctDomain is from either acctHost or the config
diff --git a/lib/v2/mckinsey/cn/index.js b/lib/v2/mckinsey/cn/index.js
index ce08629275..0f6e24dcb2 100644
--- a/lib/v2/mckinsey/cn/index.js
+++ b/lib/v2/mckinsey/cn/index.js
@@ -2,7 +2,7 @@
// https://github.com/DIYgod/RSSHub/issues/8239
// https://github.com/DIYgod/RSSHub/pull/8288
const got = require('got');
-const { parseDate } = require('@/utils/parse-date');
+import { parseDate } from '@/utils/parse-date';
const { categories } = require('./category-map');
const baseUrl = 'https://www.mckinsey.com.cn';
@@ -16,7 +16,7 @@ module.exports = async (ctx) => {
const posts = await got(`${endpoint}/wp/v2/posts`, {
searchParams: {
- per_page: ctx.query.limit ? Number(ctx.query.limit) : 50,
+ per_page: ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 50,
categories: category,
},
}).json();
@@ -29,9 +29,9 @@ module.exports = async (ctx) => {
pubDate: parseDate(item.date_gmt),
}));
- ctx.state.data = {
+ ctx.set('data', {
title: category ? `McKinsey Greater China - ${categories[category].name}` : `McKinsey Greater China`,
link: `${baseUrl}/${category === '25' ? categories[category].slug : `${categories[25].slug}/${categories[category].slug}`}/`,
item: items,
- };
+ });
};
diff --git a/lib/v2/mdpi/journal.js b/lib/v2/mdpi/journal.js
index c3177e57f7..8438a56b10 100644
--- a/lib/v2/mdpi/journal.js
+++ b/lib/v2/mdpi/journal.js
@@ -1,27 +1,27 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
const path = require('path');
-const { art } = require('@/utils/render');
+import { art } from '@/utils/render';
const { CookieJar } = require('tough-cookie');
const cookieJar = new CookieJar();
module.exports = async (ctx) => {
- const journal = ctx.params.journal;
+ const journal = ctx.req.param('journal');
const host = 'https://www.mdpi.com';
const jrnlUrl = `${host}/journal/${journal}`;
const response = await got(jrnlUrl, {
cookieJar,
});
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const jrnlName = $('.journal__description').find('h1').text();
const issueUrl = `${host}${$('.side-menu-ul').find('a').eq(1).attr('href')}`;
const response2 = await got(issueUrl, {
cookieJar,
});
- const $2 = cheerio.load(response2.data);
+ const $2 = load(response2.data);
const issue = $2('.content__container').find('h1').text().trim();
const list = $2('.article-item')
.map((_, item) => {
@@ -57,9 +57,9 @@ module.exports = async (ctx) => {
return item;
});
- ctx.state.data = {
+ ctx.set('data', {
title: jrnlName,
link: jrnlUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/medieval-china/post.js b/lib/v2/medieval-china/post.js
index 3e8e59bb03..1e0257a31f 100644
--- a/lib/v2/medieval-china/post.js
+++ b/lib/v2/medieval-china/post.js
@@ -1,18 +1,18 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
-const timezone = require('@/utils/timezone');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import timezone from '@/utils/timezone';
module.exports = async (ctx) => {
const baseUrl = 'https://medieval-china.club';
const { data: response } = await got(baseUrl);
- const $ = cheerio.load(response);
+ const $ = load(response);
const posts = JSON.parse(
$('script:contains("window.localPosts")')
.text()
.match(/window\.localPosts = JSON\.parse\('(.*)'\);/)[1]
)
- .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 10)
+ .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 10)
.map((item) => ({
title: item.title,
link: `${baseUrl}${item.path}`,
@@ -22,7 +22,7 @@ module.exports = async (ctx) => {
posts.map((item) =>
ctx.cache.tryGet(item.link, async () => {
const { data: response } = await got(item.link);
- const $ = cheerio.load(response);
+ const $ = load(response);
const imgSrc = $('img').attr('data-original');
$('img').attr('src', `${baseUrl}${imgSrc}`);
$('.head-mask').remove();
@@ -33,12 +33,12 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: '中国的中古',
link: baseUrl,
item: items,
image: 'https://medieval-china.club/images/icons/favicon-144x144.png',
description:
'世界那么大，你无法去到每一个地方，感受每一处风景；时间那么长，那些逝去的人你也终将无法与之谋面。而通过古人之文字，今人之分享，你可以领略以前风光之奇绝瑰玮，感受逝人之人情冷暖。中古就是这么一个地方，大家来自全球各地，不同时区，不同性别，不同身份，不同职业，但是大家都被中古的绚烂华章聚集在一起，哀其所哀，乐其所乐。这是一个虚拟的世界，但是我们仿佛跨越千里而来，谈一场绝世爱恋，今夕何夕！仅以此网站献给中古club的每一位成员，契阔谈宴，西园不芜！',
- };
+ });
};
diff --git a/lib/v2/medium/following.js b/lib/v2/medium/following.js
index ac55a92b40..48d3484178 100644
--- a/lib/v2/medium/following.js
+++ b/lib/v2/medium/following.js
@@ -1,10 +1,10 @@
-const config = require('@/config').value;
+import { config } from '@/config';
const parseArticle = require('./parse-article.js');
const { getFollowingFeedQuery } = require('./graphql.js');
module.exports = async (ctx) => {
- const user = ctx.params.user;
+ const user = ctx.req.param('user');
const cookie = config.medium.cookies[user];
if (cookie === undefined) {
@@ -23,9 +23,9 @@ module.exports = async (ctx) => {
const parsedArticles = await Promise.all(urls.map((url) => parseArticle(ctx, url)));
- ctx.state.data = {
+ ctx.set('data', {
title: `${user} Medium Following`,
link: 'https://medium.com/?feed=following',
item: parsedArticles,
- };
+ });
};
diff --git a/lib/v2/medium/for-you.js b/lib/v2/medium/for-you.js
index ab86b23613..77346070a5 100644
--- a/lib/v2/medium/for-you.js
+++ b/lib/v2/medium/for-you.js
@@ -1,10 +1,10 @@
-const config = require('@/config').value;
+import { config } from '@/config';
const parseArticle = require('./parse-article.js');
const { getWebInlineRecommendedFeedQuery } = require('./graphql.js');
module.exports = async (ctx) => {
- const user = ctx.params.user;
+ const user = ctx.req.param('user');
const cookie = config.medium.cookies[user];
if (cookie === undefined) {
@@ -23,9 +23,9 @@ module.exports = async (ctx) => {
const parsedArticles = await Promise.all(urls.map((url) => parseArticle(ctx, url)));
- ctx.state.data = {
+ ctx.set('data', {
title: `${user} Medium For You`,
link: 'https://medium.com/',
item: parsedArticles,
- };
+ });
};
diff --git a/lib/v2/medium/graphql.js b/lib/v2/medium/graphql.js
index 75b9fcc7ec..4f5d2e791c 100644
--- a/lib/v2/medium/graphql.js
+++ b/lib/v2/medium/graphql.js
@@ -1,4 +1,4 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
async function graphqlRequest(body, cookie) {
const { data } = await got('https://medium.com/_/graphql', {
diff --git a/lib/v2/medium/list.js b/lib/v2/medium/list.js
index 0c5202148e..b5d13cfa86 100644
--- a/lib/v2/medium/list.js
+++ b/lib/v2/medium/list.js
@@ -1,11 +1,11 @@
-const config = require('@/config').value;
+import { config } from '@/config';
const parseArticle = require('./parse-article.js');
const { getUserCatalogMainContentQuery } = require('./graphql.js');
module.exports = async (ctx) => {
- const user = ctx.params.user;
- const catalogId = ctx.params.catalogId;
+ const user = ctx.req.param('user');
+ const catalogId = ctx.req.param('catalogId');
const cookie = config.medium.cookies[user];
@@ -24,9 +24,9 @@ module.exports = async (ctx) => {
const parsedArticles = await Promise.all(urls.map((url) => parseArticle(ctx, url)));
- ctx.state.data = {
+ ctx.set('data', {
title: `List: ${name}`,
link: `https://medium.com/@${user}/list/${catalogId}`,
item: parsedArticles,
- };
+ });
};
diff --git a/lib/v2/medium/parse-article.js b/lib/v2/medium/parse-article.js
index aad3bb3868..6eb46a6340 100644
--- a/lib/v2/medium/parse-article.js
+++ b/lib/v2/medium/parse-article.js
@@ -1,7 +1,7 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
-const config = require('@/config').value;
+import { config } from '@/config';
async function parse(url, cookie = '') {
const { data } = await got(url, {
@@ -9,7 +9,7 @@ async function parse(url, cookie = '') {
cookie,
},
});
- const $ = cheerio.load(data);
+ const $ = load(data);
const publishedTime = $('meta[property="article:published_time"]').attr('content');
const author = $('meta[name="author"]').attr('content');
diff --git a/lib/v2/medium/tag.js b/lib/v2/medium/tag.js
index 7bdfd047aa..c8883cd758 100644
--- a/lib/v2/medium/tag.js
+++ b/lib/v2/medium/tag.js
@@ -1,11 +1,11 @@
-const config = require('@/config').value;
+import { config } from '@/config';
const parseArticle = require('./parse-article.js');
const { getWebInlineTopicFeedQuery } = require('./graphql.js');
module.exports = async (ctx) => {
- const user = ctx.params.user;
- const tag = ctx.params.tag;
+ const user = ctx.req.param('user');
+ const tag = ctx.req.param('tag');
const cookie = config.medium.cookies[user];
if (cookie === undefined) {
@@ -24,9 +24,9 @@ module.exports = async (ctx) => {
const parsedArticles = await Promise.all(urls.map((url) => parseArticle(ctx, url)));
- ctx.state.data = {
+ ctx.set('data', {
title: `${user} Medium Following Tag ${tag}`,
link: `https://medium.com/?tag=${tag}`,
item: parsedArticles,
- };
+ });
};
diff --git a/lib/v2/medsci/index.js b/lib/v2/medsci/index.js
index 21587e56c5..b69c4e88b3 100644
--- a/lib/v2/medsci/index.js
+++ b/lib/v2/medsci/index.js
@@ -1,10 +1,10 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
const { parseDate, parseRelativeDate } = require('@/utils/parse-date');
module.exports = async (ctx) => {
- let sid = ctx.params.sid ?? '';
- const tid = ctx.params.tid ?? '';
+ let sid = ctx.req.param('sid') ?? '';
+ const tid = ctx.req.param('tid') ?? '';
sid = sid === 'recommend' ? '' : sid;
@@ -16,7 +16,7 @@ module.exports = async (ctx) => {
url: currentUrl,
});
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
let items = $('#articleList')
.find('.ms-link')
@@ -41,7 +41,7 @@ module.exports = async (ctx) => {
url: item.link,
});
- const content = cheerio.load(detailResponse.data);
+ const content = load(detailResponse.data);
const pubDateMatches = detailResponse.data.match(/"publishedTime":"(.*)","publishedTimeString"/);
@@ -59,9 +59,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: `${sid ? $('.department-header-active').text() : '推荐'} -${tid ? ` ${$('.department-keywords-ul .active').text()} -` : ''} MedSci.cn`,
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/metacritic/index.js b/lib/v2/metacritic/index.js
index 208ceafaa8..7a088a1517 100644
--- a/lib/v2/metacritic/index.js
+++ b/lib/v2/metacritic/index.js
@@ -1,14 +1,14 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
const { sorts, types } = require('./util');
module.exports = async (ctx) => {
const { type = 'game', sort = 'new', filter } = ctx.params;
- const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 50;
+ const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 50;
const rootUrl = 'https://www.metacritic.com';
const rootApiUrl = 'https://internal-prod.apigee.fandom.net';
@@ -101,11 +101,11 @@ module.exports = async (ctx) => {
comments: item.criticScoreSummary?.reviewCount ? Number.parseInt(item.criticScoreSummary?.reviewCount, 10) : 0,
}));
- const $ = cheerio.load(currentResponse);
+ const $ = load(currentResponse);
const icon = new URL($('meta[data-hid="msapplication-task-metacritic"]').prop('content').split('icon-uri=').pop(), rootUrl).href;
- ctx.state.data = {
+ ctx.set('data', {
item: items,
title: $('title').text(),
link: currentUrl,
@@ -117,5 +117,5 @@ module.exports = async (ctx) => {
subtitle: $('meta[name="msapplication-tooltip"]').prop('content'),
author: $('meta[name="twitter:site"]').prop('content'),
allowEmpty: true,
- };
+ });
};
diff --git a/lib/v2/metacritic/release.js b/lib/v2/metacritic/release.js
index a8231c429a..2e354876a9 100644
--- a/lib/v2/metacritic/release.js
+++ b/lib/v2/metacritic/release.js
@@ -1,14 +1,14 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
const { toTitleCase } = require('@/utils/common-utils');
-const cheerio = require('cheerio');
+import { load } from 'cheerio';
module.exports = async (ctx) => {
let type = 'new-releases';
let title = 'New Releases';
- const sort = ctx.params.sort || 'date';
+ const sort = ctx.req.param('sort') || 'date';
- switch (ctx.params.type) {
+ switch (ctx.req.param('type')) {
case 'coming':
type = 'coming-soon';
title = 'Coming Soon';
@@ -19,7 +19,7 @@ module.exports = async (ctx) => {
break;
}
- const url = `https://www.metacritic.com/browse/games/release-date/${type}/${ctx.params.platform}/${sort}`;
+ const url = `https://www.metacritic.com/browse/games/release-date/${type}/${ctx.req.param('platform')}/${sort}`;
const response = await got({
method: 'get',
@@ -27,11 +27,11 @@ module.exports = async (ctx) => {
});
const data = response.body;
- const $ = cheerio.load(data);
+ const $ = load(data);
const list = $('.list_products > li').get().slice(0, 10);
const result = list.map((item) => {
- const $ = cheerio.load(item);
+ const $ = load(item);
return {
title: $('.product_title').text().trim(),
url: 'https://www.metacritic.com' + $('.product_title > a').attr('href'),
@@ -41,13 +41,13 @@ module.exports = async (ctx) => {
};
});
- ctx.state.data = {
- title: toTitleCase(`Metacritic ${ctx.params.platform} games ${title}`),
+ ctx.set('data', {
+ title: toTitleCase(`Metacritic ${ctx.req.param('platform')} games ${title}`),
link: url,
item: result.map((item) => ({
title: `${item.metascore === 'tbd' ? '' : '[' + item.metascore + ']'} ${item.title}`,
description: `Release Date: ${item.date}
Metacritic Score: ${item.metascore}
User Score: ${item.userscore}
`, link: item.url, })), - }; + }); }; diff --git a/lib/v2/meteor/boards.js b/lib/v2/meteor/boards.js index bcd2a74c7b..204c1d96ab 100644 --- a/lib/v2/meteor/boards.js +++ b/lib/v2/meteor/boards.js @@ -3,9 +3,9 @@ const { baseUrl, getBoards } = require('./utils'); module.exports = async (ctx) => { const items = await getBoards(ctx.cache.tryGet); - ctx.state.data = { + ctx.set('data', { title: '看板列表', link: `${baseUrl}/board/all`, item: items, - }; + }); }; diff --git a/lib/v2/meteor/index.js b/lib/v2/meteor/index.js index d32393b2e4..baf5ca0f0d 100644 --- a/lib/v2/meteor/index.js +++ b/lib/v2/meteor/index.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const { baseUrl, getBoards, renderDesc } = require('./utils'); module.exports = async (ctx) => { @@ -17,7 +17,7 @@ module.exports = async (ctx) => { boardId: board, isCollege: false, page: 0, - pageSize: ctx.query.limit ? Number(ctx.query.limit) : 30, + pageSize: ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 30, }, }); @@ -35,11 +35,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${board === 'all' ? '全部看板' : boardInfo.title} | Meteor 學生社群`, description: board === 'all' ? null : boardInfo.feedDescription, image: board === 'all' ? null : boardInfo.imgUrl === 'not_set' ? null : boardInfo.imgUrl, link: `${board === 'all' ? `${baseUrl}/board/all` : boardInfo.link}/new`, item: items, - }; + }); }; diff --git a/lib/v2/meteor/utils.js b/lib/v2/meteor/utils.js index fb3a54bbea..a8711d0eb9 100644 --- a/lib/v2/meteor/utils.js +++ b/lib/v2/meteor/utils.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); const baseUrl = 'https://meteor.today'; diff --git a/lib/v2/metmuseum/exhibitions.js b/lib/v2/metmuseum/exhibitions.js index 4bb01e156f..c256c419c4 100644 --- a/lib/v2/metmuseum/exhibitions.js +++ b/lib/v2/metmuseum/exhibitions.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; function generateExhibitionItem(result) { return { @@ -12,7 +12,7 @@ function generateExhibitionItem(result) { } module.exports = async (ctx) => { - const searchType = ctx.params.state ?? 'current'; + const searchType = ctx.req.param('state') ?? 'current'; const url = `https://www.metmuseum.org/ghidorah/ExhibitionListing/Search?searchType=${searchType}`; @@ -23,9 +23,9 @@ module.exports = async (ctx) => { const data = response.data.data; - ctx.state.data = { + ctx.set('data', { title: 'The Metropolitan Museum of Art - Exhibitions', link: 'https://www.metmuseum.org/exhibitions', item: data.results.map((element) => generateExhibitionItem(element)), - }; + }); }; diff --git a/lib/v2/mihoyo/bbs/cache.js b/lib/v2/mihoyo/bbs/cache.js index 6ed3647b39..69b1ffbfc1 100644 --- a/lib/v2/mihoyo/bbs/cache.js +++ b/lib/v2/mihoyo/bbs/cache.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const config = require('@/config').value; +import got from '@/utils/got'; +import { config } from '@/config'; module.exports = { getUserFullInfo: (ctx, uid) => { diff --git a/lib/v2/mihoyo/bbs/follow-list.js b/lib/v2/mihoyo/bbs/follow-list.js index 8acbf2588c..a314fc2b99 100644 --- a/lib/v2/mihoyo/bbs/follow-list.js +++ b/lib/v2/mihoyo/bbs/follow-list.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); const cache = require('./cache'); @@ -7,7 +7,7 @@ const renderDescription = (description, images) => art(path.join(__dirname, '../ module.exports = async (ctx) => { const { uid } = ctx.params; - const page_size = ctx.query.limit || '20'; + const page_size = ctx.req.query('limit') || '20'; const searchParams = { gids: 2, uid, diff --git a/lib/v2/mihoyo/bbs/img-ranking.js b/lib/v2/mihoyo/bbs/img-ranking.js index e2a3dd51a7..1e2c1b64ea 100644 --- a/lib/v2/mihoyo/bbs/img-ranking.js +++ b/lib/v2/mihoyo/bbs/img-ranking.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { DATA_MAP, RANKING_TYPE_MAP } = require('./static-data'); const { post2item } = require('./utils'); @@ -40,9 +40,9 @@ const getRankingTypeInfo = (game, ranking_type) => { module.exports = async (ctx) => { const { game } = ctx.params; - const routeParams = Object.fromEntries(new URLSearchParams(ctx.params.routeParams)); + const routeParams = Object.fromEntries(new URLSearchParams(ctx.req.param('routeParams'))); const { forumType: forum_type = 'tongren', cateType: cate_type, rankingType: ranking_type, lastId: last_id = '' } = routeParams; - const page_size = ctx.query.limit || '20'; + const page_size = ctx.req.query('limit') || '20'; const { gids, title: game_title } = getGameInfo(game); if (!gids) { throw new Error('未知的游戏！'); diff --git a/lib/v2/mihoyo/bbs/official.js b/lib/v2/mihoyo/bbs/official.js index 9e38ea88bb..2131b8c47e 100644 --- a/lib/v2/mihoyo/bbs/official.js +++ b/lib/v2/mihoyo/bbs/official.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { post2item } = require('./utils'); // 游戏id const GITS_MAP = { diff --git a/lib/v2/mihoyo/bbs/timeline.js b/lib/v2/mihoyo/bbs/timeline.js index 5e580ff6f5..e9c64acbce 100644 --- a/lib/v2/mihoyo/bbs/timeline.js +++ b/lib/v2/mihoyo/bbs/timeline.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const cache = require('./cache'); -const config = require('@/config').value; +import { config } from '@/config'; const { post2item } = require('./utils'); module.exports = async (ctx) => { @@ -8,7 +8,7 @@ module.exports = async (ctx) => { throw new Error('Miyoushe Timeline is not available due to the absense of [Miyoushe Cookie]. Check relevant config tutorial'); } - const page_size = ctx.query.limit || '20'; + const page_size = ctx.req.query('limit') || '20'; const searchParams = { gids: 2, page_size, diff --git a/lib/v2/mihoyo/bbs/user-post.js b/lib/v2/mihoyo/bbs/user-post.js index 547ff0fa33..b9adf4d76c 100644 --- a/lib/v2/mihoyo/bbs/user-post.js +++ b/lib/v2/mihoyo/bbs/user-post.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { post2item } = require('./utils'); module.exports = async (ctx) => { const { uid } = ctx.params; - const size = ctx.query.limit || '20'; + const size = ctx.req.query('limit') || '20'; const searchParams = { uid, size, diff --git a/lib/v2/mihoyo/bbs/utils.js b/lib/v2/mihoyo/bbs/utils.js index 165d8fdd0b..1cad74e011 100644 --- a/lib/v2/mihoyo/bbs/utils.js +++ b/lib/v2/mihoyo/bbs/utils.js @@ -1,6 +1,6 @@ -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; const renderDescription = (description, images) => art(path.join(__dirname, '../templates/description.art'), { description, images }); diff --git a/lib/v2/mihoyo/sr/news.js b/lib/v2/mihoyo/sr/news.js index a48c485377..6d860c45d5 100644 --- a/lib/v2/mihoyo/sr/news.js +++ b/lib/v2/mihoyo/sr/news.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const categories = { 'zh-cn': { @@ -45,7 +45,7 @@ const categories = { module.exports = async (ctx) => { // location 地区 category 类型 const { location = 'zh-cn', category = 'news-all' } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 50; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 50; const url = location === 'zh-cn' ? `https://api-takumi-static.mihoyo.com/content_v2_user/app/1963de8dc19e461c/getContentList?iPage=1&iPageSize=${limit}&sLangKey=zh-cn&isPreview=0&iChanId=${categories[location][category].id}` @@ -61,9 +61,9 @@ module.exports = async (ctx) => { category: item.sCategoryName, })); - ctx.state.data = { + ctx.set('data', { title: `${categories[location][category].title}-崩坏：星穹铁道`, link: url, item: items, - }; + }); }; diff --git a/lib/v2/mihoyo/ys/news.js b/lib/v2/mihoyo/ys/news.js index f9b7251ea2..ce16279ca8 100644 --- a/lib/v2/mihoyo/ys/news.js +++ b/lib/v2/mihoyo/ys/news.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const categories = { @@ -76,9 +76,9 @@ const apiUrls = { }; module.exports = async (ctx) => { - const location = ctx.params.location ?? 'main'; - const category = ctx.params.category ?? 'latest'; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 50; + const location = ctx.req.param('location') ?? 'main'; + const category = ctx.req.param('category') ?? 'latest'; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 50; const params = { main: `pageNum=1&channelId=${categories[category][location].id}&pageSize=${limit}`, @@ -153,9 +153,9 @@ module.exports = async (ctx) => { ); } - ctx.state.data = { + ctx.set('data', { title: `原神 - ${categories[category][location].title}`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/mindmeister/example.js b/lib/v2/mindmeister/example.js index 764ef3f669..15ef4994ba 100644 --- a/lib/v2/mindmeister/example.js +++ b/lib/v2/mindmeister/example.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { art } from '@/utils/render'; const path = require('path'); const baseUrl = 'https://www.mindmeister.com'; @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const link = `${baseUrl}${language === 'en' || language === 'other' ? '' : `/${language}`}/${category === 'mind-map-examples' ? category : `mind-maps/${category}?language=${language}`}`; const respsonse = await got(link); - const $ = cheerio.load(respsonse.data); + const $ = load(respsonse.data); const items = $('#public-listing .map-tile-wrapper') .toArray() @@ -34,11 +34,11 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), description: $('head meta[name=description]').text(), link, item: items, language, - }; + }); }; diff --git a/lib/v2/minecraft/version.js b/lib/v2/minecraft/version.js index 81ce238815..bb482dd588 100644 --- a/lib/v2/minecraft/version.js +++ b/lib/v2/minecraft/version.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; module.exports = async (ctx) => { const url = 'https://launchermeta.mojang.com/mc/game/version_manifest.json'; @@ -19,7 +19,7 @@ module.exports = async (ctx) => { const title = `Minecraft Java版游戏更新`; - ctx.state.data = { + ctx.set('data', { title, link: `https://www.minecraft.net/`, description: title, @@ -30,5 +30,5 @@ module.exports = async (ctx) => { link: `https://www.minecraft.net`, guid: item.id + item.type, })), - }; + }); }; diff --git a/lib/v2/mingpao/index.js b/lib/v2/mingpao/index.js index 1dbe50a8ed..35dc861726 100644 --- a/lib/v2/mingpao/index.js +++ b/lib/v2/mingpao/index.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const parser = require('@/utils/rss-parser'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const logger = require('@/utils/logger'); @@ -18,8 +18,8 @@ const renderDesc = (media, desc) => }); module.exports = async (ctx) => { - const type = ctx.params.type ?? 'ins'; - const category = ctx.params.category ?? (type === 'ins' ? 'all' : 's00001'); + const type = ctx.req.param('type') ?? 'ins'; + const category = ctx.req.param('category') ?? (type === 'ins' ? 'all' : 's00001'); const link = `https://news.mingpao.com/rss/${type}/${category}.xml`; const feed = await parser.parseURL(link); @@ -42,7 +42,7 @@ module.exports = async (ctx) => { throw error; } - const $ = cheerio.load(response.data); + const $ = load(response.data); const fancyboxImg = $('a.fancybox').length ? $('a.fancybox') : $('a.fancybox-buttons'); // remove unwanted elements @@ -88,12 +88,12 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: feed.title, link: feed.link, description: feed.description, item: items, image: feed.image.url, language: feed.language, - }; + }); }; diff --git a/lib/v2/mirror/index.js b/lib/v2/mirror/index.js index 5caa18d043..c0c504b6ed 100644 --- a/lib/v2/mirror/index.js +++ b/lib/v2/mirror/index.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const md = require('markdown-it')({ html: true, linkify: true, @@ -7,7 +7,7 @@ const md = require('markdown-it')({ const { isValidHost } = require('@/utils/valid-host'); module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); if (!id.endsWith('.eth') && !isValidHost(id)) { throw new Error('Invalid id'); } @@ -31,11 +31,11 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: `${data.props.pageProps.publicationLayoutProject.displayName} - Mirror`, description: data.props.pageProps.publicationLayoutProject.description, image: data.props.pageProps.publicationLayoutProject.avatarURL, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/missav/new.js b/lib/v2/missav/new.js index 2a4858b827..c8cdc100a5 100644 --- a/lib/v2/missav/new.js +++ b/lib/v2/missav/new.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { const baseUrl = 'https://missav.com'; const { data: response } = await got(`${baseUrl}/dm397/new`); - const $ = cheerio.load(response); + const $ = load(response); const items = $('.grid .group') .toArray() @@ -27,10 +27,10 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), description: $('head meta[name="description"]').attr('content'), link: baseUrl, item: items, - }; + }); }; diff --git a/lib/v2/misskey/featured-notes.js b/lib/v2/misskey/featured-notes.js index 3830d43567..e5dd4a1a83 100644 --- a/lib/v2/misskey/featured-notes.js +++ b/lib/v2/misskey/featured-notes.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const utils = require('./utils'); -const config = require('@/config').value; +import { config } from '@/config'; module.exports = async (ctx) => { - const site = ctx.params.site; + const site = ctx.req.param('site'); if (!config.feature.allow_user_supply_unsafe_domain && !utils.allowSiteList.includes(site)) { - ctx.throw(403, `This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`); + throw new Error(`This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`); } // docs on: https://misskey-hub.net/docs/api/endpoints/notes/featured.html @@ -21,9 +21,9 @@ module.exports = async (ctx) => { const list = response.data; - ctx.state.data = { + ctx.set('data', { title: `Featured Notes on ${site}`, link: `https://${site}/explore`, item: utils.parseNotes(list, site), - }; + }); }; diff --git a/lib/v2/misskey/utils.js b/lib/v2/misskey/utils.js index 4f64633485..546febb03d 100644 --- a/lib/v2/misskey/utils.js +++ b/lib/v2/misskey/utils.js @@ -1,5 +1,5 @@ -const { art } = require('@/utils/render'); -const { parseDate } = require('@/utils/parse-date'); +import { art } from '@/utils/render'; +import { parseDate } from '@/utils/parse-date'; const path = require('path'); const allowSiteList = ['misskey.io', 'madost.one', 'mk.nixnet.social']; diff --git a/lib/v2/mittrchina/index.js b/lib/v2/mittrchina/index.js index 3cef7e45ec..53cc349eda 100644 --- a/lib/v2/mittrchina/index.js +++ b/lib/v2/mittrchina/index.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -24,7 +24,7 @@ module.exports = async (ctx) => { }; const { type = 'index' } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 10; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 10; const link = `https://apii.mittrchina.com${typeMap[type].apiPath}`; const { data: response } = @@ -91,9 +91,9 @@ module.exports = async (ctx) => { ); } - ctx.state.data = { + ctx.set('data', { title: `MIT 科技评论 - ${typeMap[type].title}`, link: `https://www.mittrchina.com/${type}`, item: items, - }; + }); }; diff --git a/lib/v2/mixcloud/index.js b/lib/v2/mixcloud/index.js index 9f2f7d3d2f..d690e89e0f 100644 --- a/lib/v2/mixcloud/index.js +++ b/lib/v2/mixcloud/index.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const CryptoJS = require('crypto-js'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; const { queries } = require('./queries'); module.exports = async (ctx) => { @@ -13,11 +13,11 @@ module.exports = async (ctx) => { 'X-Requested-With': 'XMLHttpRequest', }; - const type = ctx.params.type ?? 'uploads'; + const type = ctx.req.param('type') ?? 'uploads'; if (!['stream', 'uploads', 'favorites', 'listens'].includes(type)) { throw new Error(`Invalid type: ${type}`); } - const username = ctx.params.username; + const username = ctx.req.param('username'); const config = { stream: { name: 'Stream', node: 'stream' }, @@ -30,7 +30,7 @@ module.exports = async (ctx) => { query: queries.stream.query, variables: { lookup: { - username: ctx.params.username, + username: ctx.req.param('username'), }, }, }, @@ -38,7 +38,7 @@ module.exports = async (ctx) => { query: queries.uploads.query, variables: { lookup: { - username: ctx.params.username, + username: ctx.req.param('username'), }, orderBy: 'LATEST', }, @@ -47,7 +47,7 @@ module.exports = async (ctx) => { query: queries.favorites.query, variables: { lookup: { - username: ctx.params.username, + username: ctx.req.param('username'), }, }, }, @@ -55,7 +55,7 @@ module.exports = async (ctx) => { query: queries.listens.query, variables: { lookup: { - username: ctx.params.username, + username: ctx.req.param('username'), }, }, }, @@ -102,12 +102,12 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: `Mixcloud - ${data.user.displayName}'s ${config[type].name}`, description: biog.replaceAll('\n', '
'), itunes_author: data.user.displayName, image, link: `${host}/${username}/${type}/`, item: items, - }; + }); }; diff --git a/lib/v2/modb/topic.js b/lib/v2/modb/topic.js index 7c7bd684e5..572f8c9c4d 100644 --- a/lib/v2/modb/topic.js +++ b/lib/v2/modb/topic.js @@ -1,12 +1,12 @@ -const cheerio = require('cheerio'); -const got = require('@/utils/got'); +import { load } from 'cheerio'; +import got from '@/utils/got'; const logger = require('@/utils/logger'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const baseUrl = 'https://www.modb.pro'; - const topicId = ctx.params.id; + const topicId = ctx.req.param('id'); const response = await got({ url: `${baseUrl}/api/columns/getKnowledge`, searchParams: { @@ -44,16 +44,16 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const { data: response } = await got(item.link); - const $ = cheerio.load(response); + const $ = load(response); item.description = $('div.editor-content-styl.article-style').first().html(); return item; }) ) ); - ctx.state.data = { + ctx.set('data', { title: '墨天轮合辑', link: `${baseUrl}/topic/${topicId}`, item: items, - }; + }); }; diff --git a/lib/v2/modelscope/community.js b/lib/v2/modelscope/community.js index 18f644736e..6cda3f07f3 100644 --- a/lib/v2/modelscope/community.js +++ b/lib/v2/modelscope/community.js @@ -1,15 +1,15 @@ -const cheerio = require('cheerio'); -const got = require('@/utils/got'); +import { load } from 'cheerio'; +import got from '@/utils/got'; const path = require('path'); -const timezone = require('@/utils/timezone'); -const { art } = require('@/utils/render'); -const { parseDate } = require('@/utils/parse-date'); +import timezone from '@/utils/timezone'; +import { art } from '@/utils/render'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const baseUrl = 'https://community.modelscope.cn'; const { data } = await got.post(`${baseUrl}/v1/namespace_page/article`, { - json: { id: 142373, notInMediaAidList: [], pageNum: 1, pageSize: ctx.query.limit ? Number.parseInt(ctx.query.limit) : 30 }, + json: { id: 142373, notInMediaAidList: [], pageNum: 1, pageSize: ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 30 }, }); const articles = data.data.content.map((c) => ({ @@ -27,7 +27,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(item.link, async () => { const { data } = await got(item.link); - const $ = cheerio.load(data); + const $ = load(data); const initialData = JSON.parse( $('script') .text() @@ -45,11 +45,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'ModelScope魔搭社区-DevPress官方社区', description: 'ModelScope魔搭社区 DevPress官方社区-ModelScope旨在打造下一代开源的模型即服务共享平台，为泛AI开发者提供灵活、易用、低成本的一站式模型服务产品，让模型应用更简单。', image: 'https://g.alicdn.com/sail-web/maas/0.8.10/favicon/128.ico', link: baseUrl, item: items, - }; + }); }; diff --git a/lib/v2/modelscope/datasets.js b/lib/v2/modelscope/datasets.js index 0671c278e7..a3f68de09f 100644 --- a/lib/v2/modelscope/datasets.js +++ b/lib/v2/modelscope/datasets.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const md = require('markdown-it')({ html: true, linkify: true, }); const path = require('path'); -const { art } = require('@/utils/render'); -const { parseDate } = require('@/utils/parse-date'); +import { art } from '@/utils/render'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const baseUrl = 'https://modelscope.cn'; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { const { data } = await got(`${baseUrl}/api/v1/dolphin/datasets`, { searchParams: { - PageSize: ctx.query.limit ? Number.parseInt(ctx.query.limit) : 36, + PageSize: ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 36, PageNumber: 1, Target: '', Sort: 'gmt_modified', @@ -45,11 +45,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '数据集首页 · 魔搭社区', description: 'ModelScope——汇聚各领域先进的机器学习模型，提供模型探索体验、推理、训练、部署和应用的一站式服务。在这里，共建模型开源社区，发现、学习、定制和分享心仪的模型。', image: 'https://g.alicdn.com/sail-web/maas/0.8.10/favicon/128.ico', link, item: items, - }; + }); }; diff --git a/lib/v2/modelscope/models.js b/lib/v2/modelscope/models.js index 841c15896e..3c71a33f47 100644 --- a/lib/v2/modelscope/models.js +++ b/lib/v2/modelscope/models.js @@ -1,16 +1,16 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const md = require('markdown-it')({ html: true, linkify: true, }); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const baseUrl = 'https://modelscope.cn'; const link = `${baseUrl}/models`; const { data } = await got.put(`${baseUrl}/api/v1/dolphin/models`, { - json: { PageSize: ctx.query.limit ? Number.parseInt(ctx.query.limit) : 36, PageNumber: 1, SortBy: 'GmtModified', Target: '', SingleCriterion: [] }, + json: { PageSize: ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 36, PageNumber: 1, SortBy: 'GmtModified', Target: '', SingleCriterion: [] }, }); const models = data.Data.Model.Models.map((model) => ({ @@ -35,11 +35,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '模型库首页 · 魔搭社区', description: 'ModelScope——汇聚各领域先进的机器学习模型，提供模型探索体验、推理、训练、部署和应用的一站式服务。在这里，共建模型开源社区，发现、学习、定制和分享心仪的模型。', image: 'https://g.alicdn.com/sail-web/maas/0.8.10/favicon/128.ico', link, item: items, - }; + }); }; diff --git a/lib/v2/modelscope/studios.js b/lib/v2/modelscope/studios.js index 5a4444691f..4fae2f9fd1 100644 --- a/lib/v2/modelscope/studios.js +++ b/lib/v2/modelscope/studios.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const md = require('markdown-it')({ html: true, linkify: true, }); const path = require('path'); -const { art } = require('@/utils/render'); -const { parseDate } = require('@/utils/parse-date'); +import { art } from '@/utils/render'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const baseUrl = 'https://modelscope.cn'; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { const { data } = await got.put(`${baseUrl}/api/v1/studios`, { json: { - PageSize: ctx.query.limit ? Number.parseInt(ctx.query.limit) : 36, + PageSize: ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 36, PageNumber: 1, SortBy: 'gmt_modified', }, @@ -47,11 +47,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '创空间首页 · 魔搭社区', description: 'ModelScope——汇聚各领域先进的机器学习模型，提供模型探索体验、推理、训练、部署和应用的一站式服务。在这里，共建模型开源社区，发现、学习、定制和分享心仪的模型。', image: 'https://g.alicdn.com/sail-web/maas/0.8.10/favicon/128.ico', link, item: items, - }; + }); }; diff --git a/lib/v2/modrinth/versions.js b/lib/v2/modrinth/versions.js index 3dca9eb7b9..385fa9f146 100644 --- a/lib/v2/modrinth/versions.js +++ b/lib/v2/modrinth/versions.js @@ -1,9 +1,10 @@ -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); -const { value: config } = require('@/config'); +import { config } from '@/config'; +import got from '@/utils/got'; -const got = require('@/utils/got').extend({ +const customGot = got.extend({ headers: { // https://docs.modrinth.com/#section/User-Agents 'user-agent': config.trueUA, @@ -38,13 +39,13 @@ module.exports = async ( try { /** @type {import('./api').Project} */ - const project = await got(`https://api.modrinth.com/v2/project/${id}`).json(); + const project = await customGot(`https://api.modrinth.com/v2/project/${id}`).json(); /** @type {import('./api').Version[]} */ - const versions = await got(`https://api.modrinth.com/v2/project/${id}/version`, { + const versions = await customGot(`https://api.modrinth.com/v2/project/${id}/version`, { searchParams: parsedQuery, }).json(); /** @type {import('./api').Author[]} */ - const authors = await got(`https://api.modrinth.com/v2/users`, { + const authors = await customGot(`https://api.modrinth.com/v2/users`, { searchParams: { ids: JSON.stringify(versions.map((it) => it.author_id)), }, diff --git a/lib/v2/mohw/clarification.js b/lib/v2/mohw/clarification.js index 354f59bc02..22b8480731 100644 --- a/lib/v2/mohw/clarification.js +++ b/lib/v2/mohw/clarification.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const rootUrl = 'https://www.mohw.gov.tw'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.list01 a[title]') .toArray() @@ -32,7 +32,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('article').html(); item.pubDate = parseDate(content('meta[name="DC.Date"]').attr('datetime')); @@ -42,9 +42,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '即時新聞澄清 - 台灣衛生福利部', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/mox/index.js b/lib/v2/mox/index.js index 1a6bb5e825..481c5840ad 100644 --- a/lib/v2/mox/index.js +++ b/lib/v2/mox/index.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const category = ctx.params.category ?? ''; + const category = ctx.req.param('category') ?? ''; const rootUrl = 'https://mox.moe'; const currentUrl = `${rootUrl}${category ? `/l/${category}` : ''}`; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.listbg td') .toArray() @@ -39,7 +39,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.author = content('.status font a').first().text(); item.description = `.attr('src')})
${content('.author').html()}
${content('#desc_text').html()}`; @@ -49,9 +49,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'Mox.moe', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/mpaypass/main.js b/lib/v2/mpaypass/main.js index 6c74d08d2d..d1ff3a47cb 100644 --- a/lib/v2/mpaypass/main.js +++ b/lib/v2/mpaypass/main.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const { type = '' } = ctx.params; @@ -14,7 +14,7 @@ module.exports = async (ctx) => { const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const title_cn = type ? $(`a[href="http://www.mpaypass.com.cn/${type}.html"]`).text() : '最新文章'; const list = $('.newslist') @@ -37,7 +37,7 @@ module.exports = async (ctx) => { list.map((info) => ctx.cache.tryGet(info.link, async () => { const response = await got(info.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const newsbody = $('div.newsbody').html(); return { @@ -51,9 +51,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `移动支付网-${title_cn}`, link: title_url, item: out, - }; + }); }; diff --git a/lib/v2/mpaypass/news.js b/lib/v2/mpaypass/news.js index 5dbb471c88..e8d81f973f 100644 --- a/lib/v2/mpaypass/news.js +++ b/lib/v2/mpaypass/news.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const link = 'http://m.mpaypass.com.cn'; const listData = await got(link); - const $list = cheerio.load(listData.data); - ctx.state.data = { + const $list = load(listData.data); + ctx.set('data', { title: '新闻 - 移动支付网', link, language: 'zh-CN', @@ -22,7 +22,7 @@ module.exports = async (ctx) => { return ctx.cache.tryGet(href, async () => { const contentData = await got.get(href); - const $content = cheerio.load(contentData.data); + const $content = load(contentData.data); const description = $content('.newslist-body').html(); return { @@ -35,5 +35,5 @@ module.exports = async (ctx) => { }) .get() ), - }; + }); }; diff --git a/lib/v2/mrdx/daily.js b/lib/v2/mrdx/daily.js index b2dfa999c4..0d4bcd4c53 100644 --- a/lib/v2/mrdx/daily.js +++ b/lib/v2/mrdx/daily.js @@ -1,11 +1,11 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { getElementChildrenInnerText } = require('./utils'); const dayjs = require('dayjs'); const utc = require('dayjs/plugin/utc'); dayjs.extend(utc); -const got = require('@/utils/got'); +import got from '@/utils/got'; module.exports = async (ctx) => { const dateFormatted = dayjs().utcOffset(8).format('YYYYMMDD'); @@ -17,7 +17,7 @@ module.exports = async (ctx) => { url: link, method: 'get', }); - const $ = cheerio.load(indexPageResponse.data); + const $ = load(indexPageResponse.data); // 当日所有文章Url在的`daoxiang` attribute中 // 其站点使用**非标准**的HTML语法 @@ -36,7 +36,7 @@ module.exports = async (ctx) => { method: 'get', }); - const $ = cheerio.load(response.data); + const $ = load(response.data); // 标题在`h2`,`h3`,`h4`,`h5`中，有多余空格和换行符 // 但是Middleware会处理 @@ -69,11 +69,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '新华每日电讯', link, item: passages, description: '中国报纸发行前三强。位列《人民日报》，《参考消息》之后。《新华每日电讯》是新华社出版的一份新闻电讯报，1993年创办，具有很高的权威性和准确性，有“一报在手，便知天下”之美誉。《新华每日电讯》为对开八版日报，集中刊登[新华社]每天向国内播发的电讯稿及图片稿。打开《新华每日电讯》，中国和全世界每天发生的重大事件便将一目了然。在人类生活节奏日益加快的当今世界，《新华每日电讯》以最便捷、最醒目的方式为公众提供最重要的新闻报道，受到公众的喜爱和拥护。', - }; + }); }; diff --git a/lib/v2/mrm/index.js b/lib/v2/mrm/index.js index eef3547418..d47cdbe335 100644 --- a/lib/v2/mrm/index.js +++ b/lib/v2/mrm/index.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const { category = 'zonghezixun3' } = ctx.params; @@ -8,7 +8,7 @@ module.exports = async (ctx) => { const link = `${baseUrl}/${category}.html`; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const list = $('#datalist_wap .li') .toArray() @@ -26,7 +26,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const { data } = await got(item.link); - const $ = cheerio.load(data); + const $ = load(data); item.description = $('.article-cont').html(); return item; @@ -34,9 +34,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, item: items, - }; + }); }; diff --git a/lib/v2/mvm/index.js b/lib/v2/mvm/index.js index 79fe7183b2..5a6e2fa4d4 100644 --- a/lib/v2/mvm/index.js +++ b/lib/v2/mvm/index.js @@ -1,19 +1,19 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const category = ctx.params.category ?? 'bqym'; + const category = ctx.req.param('category') ?? 'bqym'; const rootUrl = 'http://www.mwm.net.cn'; - const currentUrl = `${rootUrl}/web/${category === 'bqym' ? `bqym?pagesize=${ctx.query.limit ?? 100}` : category}`; + const currentUrl = `${rootUrl}/web/${category === 'bqym' ? `bqym?pagesize=${ctx.req.query('limit') ?? 100}` : category}`; const response = await got({ method: 'get', url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); $('.n_date').remove(); @@ -36,7 +36,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('.mrt20').html(); item.author = content('.mrl20') @@ -50,9 +50,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/mydrivers/cid.js b/lib/v2/mydrivers/cid.js index 3b568aa971..05d9566032 100644 --- a/lib/v2/mydrivers/cid.js +++ b/lib/v2/mydrivers/cid.js @@ -1,11 +1,11 @@ -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; const parser = require('@/utils/rss-parser'); const { rootUrl, rootRSSUrl, title, categories, getInfo, processItems } = require('./util'); module.exports = async (ctx) => { const { id } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 100; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 100; const queryString = id ? `?cid=${id}` : ''; const currentUrl = new URL(id ? `newsclass.aspx${queryString}` : '', rootUrl).href; @@ -28,10 +28,10 @@ module.exports = async (ctx) => { items = await processItems(items, ctx.cache.tryGet); } - ctx.state.data = { + ctx.set('data', { ...(await getInfo(currentUrl, ctx.cache.tryGet)), item: items, title: `${title} - ${feed.title.split(/_/).pop() || categories.zhibo}`, - }; + }); }; diff --git a/lib/v2/mydrivers/index.js b/lib/v2/mydrivers/index.js index c537c1caeb..973362351e 100644 --- a/lib/v2/mydrivers/index.js +++ b/lib/v2/mydrivers/index.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const { rootUrl, title, categories, convertToQueryString, getInfo, processItems } = require('./util'); @@ -17,7 +17,7 @@ module.exports = async (ctx) => { category = `ac/${category}`; } - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 20; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 20; const queryString = convertToQueryString(category); const currentUrl = new URL(`newsclass.aspx${queryString}`, rootUrl).href; @@ -26,7 +26,7 @@ module.exports = async (ctx) => { const { data: response } = await got(apiUrl); - const $ = cheerio.load(response); + const $ = load(response); let items = $('li[data-id]') .slice(0, limit) @@ -49,7 +49,7 @@ module.exports = async (ctx) => { items = await processItems(items, ctx.cache.tryGet); - ctx.state.data = { + ctx.set('data', { ...(await getInfo(currentUrl, ctx.cache.tryGet)), ...Object.fromEntries( Object.entries({ @@ -57,5 +57,5 @@ module.exports = async (ctx) => { title: newTitle, }).filter(([value]) => value) ), - }; + }); }; diff --git a/lib/v2/mydrivers/rank.js b/lib/v2/mydrivers/rank.js index 74eeb99079..9fa21d603e 100644 --- a/lib/v2/mydrivers/rank.js +++ b/lib/v2/mydrivers/rank.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { rootUrl, getInfo, processItems } = require('./util'); module.exports = async (ctx) => { const { range = '0' } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 10; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 10; const currentUrl = new URL('newsclass.aspx?tid=1001', rootUrl).href; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { const { data: response } = await got(apiUrl); - const $ = cheerio.load(response); + const $ = load(response); let items = $('a') .toArray() @@ -33,8 +33,8 @@ module.exports = async (ctx) => { items = await processItems(items, ctx.cache.tryGet); - ctx.state.data = { + ctx.set('data', { item: items, ...(await getInfo(currentUrl, ctx.cache.tryGet, Number.parseInt(range, 10))), - }; + }); }; diff --git a/lib/v2/mydrivers/util.js b/lib/v2/mydrivers/util.js index 1b0581c3be..f2bebbe2f8 100644 --- a/lib/v2/mydrivers/util.js +++ b/lib/v2/mydrivers/util.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const domain = 'mydrivers.com'; const rootUrl = `https://m.${domain}`; @@ -50,7 +50,7 @@ const getInfo = (url, tryGet, range) => tryGet(url, async () => { const { data: response } = await got(url); - const $ = cheerio.load(response); + const $ = load(response); const icon = new URL($('link[rel="apple-touch-icon-precomposed"]').prop('href'), rootUrl).href; const image = `https:${$('div.logo a img').prop('src')}`; @@ -91,7 +91,7 @@ const processItems = async (items, tryGet) => }, }); - const content = cheerio.load(detailResponse); + const content = load(detailResponse); item.title = content('div.news_t').text() || item.title; item.description = content('#content').html() ?? item.description; diff --git a/lib/v2/myfigurecollection/activity.js b/lib/v2/myfigurecollection/activity.js index db22714307..25fa507793 100644 --- a/lib/v2/myfigurecollection/activity.js +++ b/lib/v2/myfigurecollection/activity.js @@ -1,18 +1,18 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const { isValidHost } = require('@/utils/valid-host'); module.exports = async (ctx) => { - const category = ctx.params.category ?? '-1'; - const language = ctx.params.language ?? ''; - const latestAdditions = ctx.params.latestAdditions ?? '1'; - const latestEdits = ctx.params.latestEdits ?? '1'; - const latestAlerts = ctx.params.latestAlerts ?? '1'; - const latestPictures = ctx.params.latestPictures ?? '1'; + const category = ctx.req.param('category') ?? '-1'; + const language = ctx.req.param('language') ?? ''; + const latestAdditions = ctx.req.param('latestAdditions') ?? '1'; + const latestEdits = ctx.req.param('latestEdits') ?? '1'; + const latestAlerts = ctx.req.param('latestAlerts') ?? '1'; + const latestPictures = ctx.req.param('latestPictures') ?? '1'; if (language && !isValidHost(language)) { throw new Error('Invalid language'); @@ -26,7 +26,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const items = $('.activity-wrapper') .toArray() @@ -53,11 +53,11 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('title') .text() .replace(/ \(.*\)/, ''), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/myfigurecollection/index.js b/lib/v2/myfigurecollection/index.js index b3170bb987..1cee5159b7 100644 --- a/lib/v2/myfigurecollection/index.js +++ b/lib/v2/myfigurecollection/index.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { art } from '@/utils/render'; const path = require('path'); const { isValidHost } = require('@/utils/valid-host'); @@ -11,8 +11,8 @@ const shortcuts = { }; module.exports = async (ctx) => { - const language = ctx.params.language ?? ''; - const category = ctx.params.category ?? 'figure'; + const language = ctx.req.param('language') ?? ''; + const category = ctx.req.param('category') ?? 'figure'; if (language && !isValidHost(language)) { throw new Error('Invalid language'); } @@ -25,10 +25,10 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.item-icon, .picture-icon') - .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 25) + .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 25) .toArray() .map((item) => { item = $(item).find('a'); @@ -49,7 +49,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.title = content('.headline').text(); item.description = art(path.join(__dirname, 'templates/description.art'), { @@ -72,11 +72,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title') .text() .replace(/ \(.*\)/, ''), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/mygopen/index.js b/lib/v2/mygopen/index.js index 7789bf3dea..131b84b6d9 100644 --- a/lib/v2/mygopen/index.js +++ b/lib/v2/mygopen/index.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const label = ctx.params.label ?? ''; + const label = ctx.req.param('label') ?? ''; const rootUrl = 'https://www.mygopen.com'; const currentUrl = `${rootUrl}${label ? `/search/label/${label}` : ''}`; - const apiUrl = `${rootUrl}/feeds/posts/default${label ? `/-/${label}` : ''}?alt=json-in-script&max-results=${ctx.query.limit ? Number.parseInt(ctx.query.limit) : 50}`; + const apiUrl = `${rootUrl}/feeds/posts/default${label ? `/-/${label}` : ''}?alt=json-in-script&max-results=${ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 50}`; const response = await got({ method: 'get', @@ -20,10 +20,10 @@ module.exports = async (ctx) => { link: item.link.pop().href, })); - ctx.state.data = { + ctx.set('data', { title: `MyGoPen${label ? `: ${label}` : ''}`, link: currentUrl, item: items, description: '詐騙與謠言頻傳的年代，「MyGoPen｜這是假消息」提醒網路使用者隨時要用謹慎懷疑的態度面對網路上的消息。', - }; + }); }; diff --git a/lib/v2/mymusicsheet/usersheets.js b/lib/v2/mymusicsheet/usersheets.js index 633f2e3e66..b978258bf6 100644 --- a/lib/v2/mymusicsheet/usersheets.js +++ b/lib/v2/mymusicsheet/usersheets.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -112,9 +112,9 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: `${username}'s sheets`, link: `https://www.mymusicsheet.com/${username}?viewType=sheet&orderBy=createdAt`, item: items, - }; + }); }; diff --git a/lib/v2/mysql/release.js b/lib/v2/mysql/release.js index b2cffdfc18..57614b5053 100644 --- a/lib/v2/mysql/release.js +++ b/lib/v2/mysql/release.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const config = require('@/config').value; -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { config } from '@/config'; +import { load } from 'cheerio'; module.exports = async (ctx) => { - const version = ctx.params.version ?? '8.0'; + const version = ctx.req.param('version') ?? '8.0'; const rootUrl = 'https://dev.mysql.com'; const currentUrl = `${rootUrl}/doc/relnotes/mysql/${version}/en/`; @@ -16,7 +16,7 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('dt span a') .slice(1, -1) @@ -41,7 +41,7 @@ module.exports = async (ctx) => { }, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); content('.indexterm').remove(); content('.titlepage').first().remove(); @@ -54,9 +54,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/nasa/apod-cn.js b/lib/v2/nasa/apod-cn.js index 394d622a83..a4d846fb3d 100644 --- a/lib/v2/nasa/apod-cn.js +++ b/lib/v2/nasa/apod-cn.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 10; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 10; const rootUrl = `https://www.nasachina.cn/wp-json/wp/v2/posts?categories=2&per_page=${limit}`; const { data } = await got({ method: 'get', @@ -16,9 +16,9 @@ module.exports = async (ctx) => { link: item.link, })); - ctx.state.data = { + ctx.set('data', { title: 'NASA中文 - 天文·每日一图', link: 'https://www.nasachina.cn/nasa-image-of-the-day', item: items, - }; + }); }; diff --git a/lib/v2/nasa/apod-ncku.js b/lib/v2/nasa/apod-ncku.js index 57203c82c4..dd18482942 100644 --- a/lib/v2/nasa/apod-ncku.js +++ b/lib/v2/nasa/apod-ncku.js @@ -1,16 +1,16 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 10; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 10; const rootUrl = 'http://sprite.phys.ncku.edu.tw/astrolab/mirrors/apod/archivepix.html'; const response = await got({ method: 'get', url: rootUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('body > b > a') .slice(0, limit) @@ -27,7 +27,7 @@ module.exports = async (ctx) => { method: 'get', url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); const description = `.attr('src')})
${content('body > center').eq(1).html()}
${content('body > p').eq(0).html()}`; const pubDate = parseDate(item.link.slice(-11, -5), 'YYMMDD'); @@ -43,9 +43,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'NASA 每日一天文圖 (成大物理分站) ', link: rootUrl, item: items, - }; + }); }; diff --git a/lib/v2/nasa/apod.js b/lib/v2/nasa/apod.js index 603668218b..af88e76b70 100644 --- a/lib/v2/nasa/apod.js +++ b/lib/v2/nasa/apod.js @@ -1,16 +1,16 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 10; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 10; const rootUrl = 'https://apod.nasa.gov/apod/archivepix.html'; const response = await got({ method: 'get', url: rootUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('body > b > a') .slice(0, limit) @@ -27,7 +27,7 @@ module.exports = async (ctx) => { method: 'get', url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); const description = `
${content('body > center').eq(1).html()}
${content('body > p').eq(0).html()}`; const pubDate = timezone(parseDate(item.link.slice(-11, -5), 'YYMMDD'), -5); @@ -43,9 +43,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'NASA Astronomy Picture of the Day', link: rootUrl, item: items, - }; + }); }; diff --git a/lib/v2/natgeo/dailyphoto.js b/lib/v2/natgeo/dailyphoto.js index 2a5c32848b..065dd8176b 100644 --- a/lib/v2/natgeo/dailyphoto.js +++ b/lib/v2/natgeo/dailyphoto.js @@ -1,15 +1,15 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); -const config = require('@/config').value; +import { config } from '@/config'; module.exports = async (ctx) => { const rootUrl = 'https://www.nationalgeographic.com'; const apiUrl = `${rootUrl}/photo-of-the-day`; const response = await ctx.cache.tryGet(apiUrl, async () => (await got(apiUrl)).data, config.cache.contentExpire, false); - const $ = cheerio.load(response); + const $ = load(response); const natgeo = JSON.parse($.html().match(/window\['__natgeo__']=(.*);/)[1]); const media = natgeo.page.content.mediaspotlight.frms[0].mods[0].edgs[1].media; @@ -24,9 +24,9 @@ module.exports = async (ctx) => { author: item.img.crdt, })); - ctx.state.data = { + ctx.set('data', { title: 'Nat Geo Photo of the Day', link: apiUrl, item: items, - }; + }); }; diff --git a/lib/v2/natgeo/dailyselection.js b/lib/v2/natgeo/dailyselection.js index d89add8d53..ded9bad7af 100644 --- a/lib/v2/natgeo/dailyselection.js +++ b/lib/v2/natgeo/dailyselection.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const host = 'http://dili.bdatu.com/jiekou/mains/p1.html'; @@ -19,7 +19,7 @@ module.exports = async (ctx) => { const api = 'http://dili.bdatu.com/jiekou/albums/a' + sort + '.html'; const response = await got(api); const items = response.data.picture; - const out = new Array(); + const out = []; items.map((item) => { const info = { @@ -33,9 +33,9 @@ module.exports = async (ctx) => { return info; }); - ctx.state.data = { + ctx.set('data', { title: 'Photo of the Daily Selection', link: api, item: out, - }; + }); }; diff --git a/lib/v2/natgeo/natgeo.js b/lib/v2/natgeo/natgeo.js index fed6fe9353..f58b6a21f9 100644 --- a/lib/v2/natgeo/natgeo.js +++ b/lib/v2/natgeo/natgeo.js @@ -1,12 +1,12 @@ -const cheerio = require('cheerio'); -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import { load } from 'cheerio'; +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; // https://www.natgeomedia.com//article/ -async function load(link) { +async function loadContent(link) { const { data } = await got(link); - const $ = cheerio.load(data); + const $ = load(data); const dtStr = $('.content-title-area') .find('h6') .first() @@ -26,10 +26,10 @@ async function load(link) { } module.exports = async (ctx) => { - const type = ctx.params.type ?? ''; - const url = `https://www.natgeomedia.com/${ctx.params.cat}/${type}`; + const type = ctx.req.param('type') ?? ''; + const url = `https://www.natgeomedia.com/${ctx.req.param('cat')}/${type}`; const res = await got(url); - const $ = cheerio.load(res.data); + const $ = load(res.data); const urlList = $('.article-link-w100') .find('.read-btn') @@ -44,13 +44,13 @@ module.exports = async (ctx) => { const single = { link, }; - const other = await ctx.cache.tryGet(link, () => load(link)); + const other = await ctx.cache.tryGet(link, () => loadContent(link)); return { ...single, ...other }; }) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: url, item: out, - }; + }); }; diff --git a/lib/v2/nationalgeographic/latest-stories.js b/lib/v2/nationalgeographic/latest-stories.js index 33ad9a927f..347671123c 100644 --- a/lib/v2/nationalgeographic/latest-stories.js +++ b/lib/v2/nationalgeographic/latest-stories.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const findNatgeo = ($) => @@ -14,7 +14,7 @@ const findNatgeo = ($) => module.exports = async (ctx) => { const currentUrl = 'https://www.nationalgeographic.com/pages/topic/latest-stories'; const response = await got(currentUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const items = await Promise.all( findNatgeo($) .page.content.hub.frms.flatMap((e) => e.mods) @@ -28,7 +28,7 @@ module.exports = async (ctx) => { .map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const mods = findNatgeo($).page.content.article.frms.find((f) => f.cmsType === 'ArticleBodyFrame').mods; const bodyTile = mods.find((m) => m.edgs[0].cmsType === 'ArticleBodyTile').edgs[0]; @@ -48,9 +48,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('meta[property="og:title"]').attr('content'), link: currentUrl, item: items.filter((item) => item !== null), - }; + }); }; diff --git a/lib/v2/nature/cover.js b/lib/v2/nature/cover.js index 93884bebd1..52a015db8c 100644 --- a/lib/v2/nature/cover.js +++ b/lib/v2/nature/cover.js @@ -14,9 +14,9 @@ // natastron: Nature Astronomy // nphys Nature Physics -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { baseUrl, journalMap } = require('./utils'); const { CookieJar } = require('tough-cookie'); @@ -44,7 +44,7 @@ module.exports = async (ctx) => { const imageUrl = `https://media.springernature.com/full/springer-static/cover-hires/journal/${id}/${volume}/${issue}?as=webp`; const contents = `
`;
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const date = $('title').text().split(',')[1].trim();
const issueDescription = $('div[data-test=issue-description]').html() ?? '';
@@ -58,10 +58,10 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: 'Nature Covers Story',
description: 'Find out the cover story of some Nature journals.',
link: baseUrl,
item: out,
- };
+ });
};
diff --git a/lib/v2/nature/highlight.js b/lib/v2/nature/highlight.js
index d8c6a6a8b4..57f39c92be 100644
--- a/lib/v2/nature/highlight.js
+++ b/lib/v2/nature/highlight.js
@@ -1,5 +1,5 @@
-const cheerio = require('cheerio');
-const got = require('@/utils/got');
+import { load } from 'cheerio';
+import got from '@/utils/got';
const { baseUrl, cookieJar, getArticleList, getArticle } = require('./utils');
module.exports = async (ctx) => {
@@ -7,16 +7,16 @@ module.exports = async (ctx) => {
const url = `${baseUrl}/${journal}/articles?type=research-highlight`;
const res = await got(url, { cookieJar });
- const $ = cheerio.load(res.data);
+ const $ = load(res.data);
let items = getArticleList($);
items = await Promise.all(items.map((item) => getArticle(item, ctx)));
- ctx.state.data = {
+ ctx.set('data', {
title: $('title').text().trim(),
description: $('meta[name=description]').attr('content'),
link: url,
item: items,
- };
+ });
};
diff --git a/lib/v2/nature/news-and-comment.js b/lib/v2/nature/news-and-comment.js
index d0c73e534f..254e9a15b2 100644
--- a/lib/v2/nature/news-and-comment.js
+++ b/lib/v2/nature/news-and-comment.js
@@ -12,26 +12,26 @@
// nmat: Nature Materials
// natmachintell: Nature Machine Intelligence
-const cheerio = require('cheerio');
-const got = require('@/utils/got');
+import { load } from 'cheerio';
+import got from '@/utils/got';
const { baseUrl, cookieJar, getArticleList, getArticle } = require('./utils');
module.exports = async (ctx) => {
- const journal = ctx.params.journal;
+ const journal = ctx.req.param('journal');
const pageURL = `${baseUrl}/${journal}/news-and-comment`;
const pageResponse = await got(pageURL, { cookieJar });
- const pageCapture = cheerio.load(pageResponse.data);
+ const pageCapture = load(pageResponse.data);
const pageDescription = pageCapture('meta[name=description]').attr('content') || 'Nature, a nature research journal';
let items = getArticleList(pageCapture);
items = await Promise.all(items.map((item) => getArticle(item, ctx)));
- ctx.state.data = {
+ ctx.set('data', {
title: pageCapture('title').text(),
description: pageDescription,
link: pageURL,
item: items,
- };
+ });
};
diff --git a/lib/v2/nature/news.js b/lib/v2/nature/news.js
index 717695fc54..e1f354a661 100644
--- a/lib/v2/nature/news.js
+++ b/lib/v2/nature/news.js
@@ -1,12 +1,12 @@
-const cheerio = require('cheerio');
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
+import { load } from 'cheerio';
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
const { baseUrl, cookieJar, getArticle } = require('./utils');
module.exports = async (ctx) => {
const url = `${baseUrl}/latest-news`;
const res = await got(url, { cookieJar });
- const $ = cheerio.load(res.data);
+ const $ = load(res.data);
let items = $('.c-article-item__content')
.toArray()
@@ -21,10 +21,10 @@ module.exports = async (ctx) => {
items = await Promise.all(items.map((item) => ctx.cache.tryGet(item.link, () => getArticle(item, ctx))));
- ctx.state.data = {
+ ctx.set('data', {
title: 'Nature | Latest News',
description: $('meta[name=description]').attr('content'),
link: url,
item: items,
- };
+ });
};
diff --git a/lib/v2/nature/research.js b/lib/v2/nature/research.js
index c28a0b1089..46ce6a3851 100644
--- a/lib/v2/nature/research.js
+++ b/lib/v2/nature/research.js
@@ -13,16 +13,16 @@
// nmat: Nature Materials
// natmachintell: Nature Machine Intelligence
-const cheerio = require('cheerio');
-const got = require('@/utils/got');
+import { load } from 'cheerio';
+import got from '@/utils/got';
const { baseUrl, cookieJar, getArticleList, getDataLayer, getArticle } = require('./utils');
module.exports = async (ctx) => {
- const journal = ctx.params.journal ?? 'nature';
+ const journal = ctx.req.param('journal') ?? 'nature';
const pageURL = `${baseUrl}/${journal}/research-articles`;
const pageResponse = await got(pageURL, { cookieJar });
- const pageCapture = cheerio.load(pageResponse.data);
+ const pageCapture = load(pageResponse.data);
const pageTitle = getDataLayer(pageCapture).content.journal.title;
@@ -30,10 +30,10 @@ module.exports = async (ctx) => {
items = await Promise.all(items.map((item) => getArticle(item, ctx)));
- ctx.state.data = {
+ ctx.set('data', {
title: `Nature (${pageTitle}) | Latest Research`,
description: pageCapture('meta[name="description"]').attr('content') || `Nature, a nature research journal`,
link: pageURL,
item: items,
- };
+ });
};
diff --git a/lib/v2/nature/siteindex.js b/lib/v2/nature/siteindex.js
index dbe14a1b6b..d4b2743389 100644
--- a/lib/v2/nature/siteindex.js
+++ b/lib/v2/nature/siteindex.js
@@ -1,10 +1,10 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
const { baseUrl, cookieJar } = require('./utils');
module.exports = async (ctx) => {
const response = await got(`${baseUrl}/siteindex`, { cookieJar });
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
let items = $('li[class^="grid mq640-grid-12"]')
.toArray()
@@ -21,7 +21,7 @@ module.exports = async (ctx) => {
items.map((item) =>
ctx.cache.tryGet(`nature:siteindex:${item.title}`, async () => {
const response = await got(item.link, { cookieJar });
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
delete item.link;
try {
@@ -37,12 +37,12 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: 'Nature siteindex',
link: response.url,
item: items,
- };
- ctx.state.json = {
+ });
+ ctx.set('json', {
items,
- };
+ });
};
diff --git a/lib/v2/nature/utils.js b/lib/v2/nature/utils.js
index 6fb9d4f58c..ded7e06383 100644
--- a/lib/v2/nature/utils.js
+++ b/lib/v2/nature/utils.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
const { CookieJar } = require('tough-cookie');
const baseUrl = 'https://www.nature.com';
@@ -54,7 +54,7 @@ const getArticle = (item, ctx) =>
const response = await got(item.link, {
cookieJar,
});
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const responseUrl = new URL(response.url);
if (responseUrl.pathname.startsWith('/immersive/')) {
diff --git a/lib/v2/nautil/topics.js b/lib/v2/nautil/topics.js
index b8bee14398..546f41cd5f 100644
--- a/lib/v2/nautil/topics.js
+++ b/lib/v2/nautil/topics.js
@@ -1,7 +1,7 @@
-const cheerio = require('cheerio');
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import { load } from 'cheerio';
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
const baseUrl = 'https://nautil.us';
@@ -21,14 +21,14 @@ module.exports = async (ctx) => {
const { data: list } = await got(`${baseUrl}/wp-json/wp/v2/posts`, {
searchParams: {
- categories: categoryIdMap.find((item) => item.slug === ctx.params.tid.toLowerCase()).id,
- per_page: ctx.query.limit ? Number.parseInt(ctx.query.limit) : 20,
+ categories: categoryIdMap.find((item) => item.slug === ctx.req.param('tid').toLowerCase()).id,
+ per_page: ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 20,
},
});
const out = list.map((item) => {
const head = item.yoast_head_json;
- const $ = cheerio.load(item.content.rendered, null, false);
+ const $ = load(item.content.rendered, null, false);
// lazyload images
$('img').each((_, e) => {
e = $(e);
@@ -49,9 +49,9 @@ module.exports = async (ctx) => {
};
});
- ctx.state.data = {
- title: 'Nautilus | ' + categoryIdMap.find((item) => item.slug === ctx.params.tid.toLowerCase()).name,
- link: `${baseUrl}/topics/${ctx.params.tid}/`,
+ ctx.set('data', {
+ title: 'Nautilus | ' + categoryIdMap.find((item) => item.slug === ctx.req.param('tid').toLowerCase()).name,
+ link: `${baseUrl}/topics/${ctx.req.param('tid')}/`,
item: out,
- };
+ });
};
diff --git a/lib/v2/nbd/index.js b/lib/v2/nbd/index.js
index fd4ac7c2e7..1d6e0dbeca 100644
--- a/lib/v2/nbd/index.js
+++ b/lib/v2/nbd/index.js
@@ -1,10 +1,10 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const timezone = require('@/utils/timezone');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import timezone from '@/utils/timezone';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
- const id = ctx.params.id ?? '3';
+ const id = ctx.req.param('id') ?? '3';
const rootUrl = 'https://www.nbd.com.cn';
const currentUrl = `${rootUrl}/columns/${id}/`;
@@ -14,7 +14,7 @@ module.exports = async (ctx) => {
url: currentUrl,
});
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('.u-news-title a')
.toArray()
@@ -37,7 +37,7 @@ module.exports = async (ctx) => {
if (!detailResponse.url.startsWith(`${rootUrl}/`)) {
return item;
}
- const content = cheerio.load(detailResponse.data);
+ const content = load(detailResponse.data);
item.description = content('.g-articl-text').html();
item.pubDate = timezone(parseDate(detailResponse.data.match(/"pubDate": "(.*)"/)[1]), +8);
@@ -47,9 +47,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: `${$('h1').text() || $('.u-channelname').text()} - 每经网`,
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/nbd/router.js b/lib/v2/nbd/router.js
index b982c3ca5b..d9259ca06c 100644
--- a/lib/v2/nbd/router.js
+++ b/lib/v2/nbd/router.js
@@ -1,4 +1,4 @@
module.exports = (router) => {
- router.redirect('/daily', '/nbd/332');
+ router.get('/daily', (c) => c.redirect('/nbd/332'));
router.get('/:id?', require('./index'));
};
diff --git a/lib/v2/nber/index.js b/lib/v2/nber/index.js
index 5a7ebda392..e5d245785f 100644
--- a/lib/v2/nber/index.js
+++ b/lib/v2/nber/index.js
@@ -1,8 +1,9 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
const path = require('path');
-const { art } = require('@/utils/render');
-const { parseDate } = require('@/utils/parse-date');
+import { art } from '@/utils/render';
+import { parseDate } from '@/utils/parse-date';
+import { config } from '@/config';
async function getData(url) {
const response = await got(url).json();
@@ -12,7 +13,6 @@ async function getData(url) {
module.exports = async (ctx) => {
const url = 'https://www.nber.org/api/v1/working_page_listing/contentType/working_paper/_/_/search';
const baseUrl = 'https://www.nber.org';
- const config = require('@/config').value;
const data = await ctx.cache.tryGet(url, () => getData(url), config.cache.routeExpire, false);
const items = await Promise.all(
data
@@ -21,7 +21,7 @@ module.exports = async (ctx) => {
const link = `${baseUrl}${article.url}`;
return ctx.cache.tryGet(link, async () => {
const response = await got(link);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const downloadLink = $('meta[name="citation_pdf_url"]').attr('content');
const fullAbstract = $('.page-header__intro-inner').html();
return {
@@ -39,10 +39,10 @@ module.exports = async (ctx) => {
})
);
- ctx.state.data = {
+ ctx.set('data', {
title: 'NBER Working Paper',
link: 'https://www.nber.org/papers',
item: items,
description: `National Bureau of Economic Research Working Papers articles`,
- };
+ });
};
diff --git a/lib/v2/ncc-cma/cmdp.js b/lib/v2/ncc-cma/cmdp.js
index 49123a9545..d6c6b040f3 100644
--- a/lib/v2/ncc-cma/cmdp.js
+++ b/lib/v2/ncc-cma/cmdp.js
@@ -1,13 +1,13 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
const iconv = require('iconv-lite');
module.exports = async (ctx) => {
const { id } = ctx.params;
- const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 50;
+ const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 50;
const ids = id?.split(/\//) ?? [];
const titles = [];
@@ -19,7 +19,7 @@ module.exports = async (ctx) => {
responseType: 'buffer',
});
- const $ = cheerio.load(iconv.decode(response, 'gbk'));
+ const $ = load(iconv.decode(response, 'gbk'));
const author = '国家气候中心';
@@ -65,7 +65,7 @@ module.exports = async (ctx) => {
const image = $('img.logo').prop('src');
const icon = new URL('favicon.ico', rootUrl).href;
- ctx.state.data = {
+ ctx.set('data', {
item: items,
title: `${author} - ${subtitle}${titles.length === 0 ? '' : ` - ${titles.join('|')}`}`,
link: currentUrl,
@@ -77,5 +77,5 @@ module.exports = async (ctx) => {
subtitle,
author,
allowEmpty: true,
- };
+ });
};
diff --git a/lib/v2/ncepu/master/masterinfo.js b/lib/v2/ncepu/master/masterinfo.js
index 6a6f890c55..9c408b9e60 100644
--- a/lib/v2/ncepu/master/masterinfo.js
+++ b/lib/v2/ncepu/master/masterinfo.js
@@ -1,7 +1,7 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const timezone = require('@/utils/timezone');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import timezone from '@/utils/timezone';
+import { parseDate } from '@/utils/parse-date';
const title_map = {
tzgg: '通知公告',
@@ -20,11 +20,11 @@ const url_map = {
};
module.exports = async (ctx) => {
- const type = ctx.params.type;
+ const type = ctx.req.param('type');
const response = await got(`https://yjsy.ncepu.edu.cn/${url_map[type]}/index.htm`);
const data = response.data; // 获取页面 html 数据
- const $ = cheerio.load(data);
+ const $ = load(data);
const list = $('.articleList ul li')
.map((_, item) => {
item = $(item);
@@ -48,7 +48,7 @@ module.exports = async (ctx) => {
const items = await Promise.all(
list.map(async (item) => {
const itemData = await ctx.cache.tryGet(item.link, async () => (await got(item.link)).data);
- const content = cheerio.load(itemData);
+ const content = load(itemData);
const articleAuthor = content('.articleAuthor').html().replace('作者： ', '').replace('来源： ', '');
const eDescription = content('.article').html();
@@ -64,10 +64,10 @@ module.exports = async (ctx) => {
})
);
- ctx.state.data = {
+ ctx.set('data', {
title: `${title_map[type]}-华北电力大学研究生院`,
link: `http://yjsy.ncepu.edu.cn/${url_map[type]}`,
description: `华北电力大学研究生院${description_map[type]}`,
item: items,
- };
+ });
};
diff --git a/lib/v2/ncu/jwc.js b/lib/v2/ncu/jwc.js
index 8a02bde5ad..f3ad44fc29 100644
--- a/lib/v2/ncu/jwc.js
+++ b/lib/v2/ncu/jwc.js
@@ -1,15 +1,15 @@
-const got = require('@/utils/got'); // 自订的 got
-const cheerio = require('cheerio'); // 可以使用类似 jQuery 的 API HTML 解析器
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got'; // 自订的 got
+import { load } from 'cheerio'; // 可以使用类似 jQuery 的 API HTML 解析器
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const baseUrl = 'https://jwc.ncu.edu.cn';
const response = await got(baseUrl);
- const $ = cheerio.load(response.body);
+ const $ = load(response.body);
const list = $('.box3 .inner ul.img-list li');
- ctx.state.data = {
+ ctx.set('data', {
title: '南昌大学教务处',
link: baseUrl,
description: '南昌大学教务处',
@@ -29,5 +29,5 @@ module.exports = async (ctx) => {
pubDate: parseDate(date, 'MM-DD').setFullYear(month < 6 ? new Date().getFullYear() - 1 : new Date().getFullYear()),
};
}),
- };
+ });
};
diff --git a/lib/v2/ncwu/notice.js b/lib/v2/ncwu/notice.js
index 0857d33c3d..1bcb74badf 100644
--- a/lib/v2/ncwu/notice.js
+++ b/lib/v2/ncwu/notice.js
@@ -1,12 +1,12 @@
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
+import { load } from 'cheerio';
const baseUrl = 'https://www.ncwu.edu.cn/xxtz.htm';
module.exports = async (ctx) => {
const response = await got(baseUrl);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('div.news-item')
.toArray()
.map((item) => {
@@ -19,9 +19,9 @@ module.exports = async (ctx) => {
};
});
- ctx.state.data = {
+ ctx.set('data', {
title: $('title').text(),
link: baseUrl,
item: list,
- };
+ });
};
diff --git a/lib/v2/ndss-symposium/ndss.js b/lib/v2/ndss-symposium/ndss.js
index f74935ff34..68d7c4f83f 100644
--- a/lib/v2/ndss-symposium/ndss.js
+++ b/lib/v2/ndss-symposium/ndss.js
@@ -1,7 +1,7 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
const url = 'https://www.ndss-symposium.org';
-const { parseDate } = require('@/utils/parse-date');
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
// use wordpress api to get data
@@ -9,7 +9,7 @@ module.exports = async (ctx) => {
const items = await Promise.all(
data.map(async (elem) => {
- const $ = cheerio.load(elem.content.rendered);
+ const $ = load(elem.content.rendered);
const link = elem.link;
const pubDate = parseDate(elem.date);
@@ -32,7 +32,7 @@ module.exports = async (ctx) => {
return ctx.cache.tryGet(item.link, async () => {
// some titles and authos are not complete
const response = await got(item.link);
- const $ = cheerio.load(response.body);
+ const $ = load(response.body);
item.description = $('.paper-data').text().trim().replaceAll('\n', '');
item.title = $('h1.entry-title').text().trim().replaceAll('\n', '').replaceAll(/\s+/g, ' ');
item.author = $('h1.entry-title').siblings().text().trim().replaceAll('\n', '').replaceAll(/\s+/g, ' ');
@@ -70,11 +70,11 @@ module.exports = async (ctx) => {
})
);
- ctx.state.data = {
+ ctx.set('data', {
title: 'NDSS',
link: url,
description: 'The Network and Distributed System Security (NDSS) Symposium Accpeted Papers',
allowEmpty: true,
item: items.flat(),
- };
+ });
};
diff --git a/lib/v2/neatdownloadmanager/download.js b/lib/v2/neatdownloadmanager/download.js
index 4dacb67fd6..ffc587c8c0 100644
--- a/lib/v2/neatdownloadmanager/download.js
+++ b/lib/v2/neatdownloadmanager/download.js
@@ -1,8 +1,8 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
module.exports = async (ctx) => {
- const os = (ctx.params.os ?? '').toLowerCase();
+ const os = (ctx.req.param('os') ?? '').toLowerCase();
const rootUrl = 'https://www.neatdownloadmanager.com';
const currentUrl = `${rootUrl}/index.php`;
@@ -12,7 +12,7 @@ module.exports = async (ctx) => {
url: currentUrl,
});
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const items = $('.p1')
.toArray()
@@ -38,9 +38,9 @@ module.exports = async (ctx) => {
};
});
- ctx.state.data = {
+ ctx.set('data', {
title: 'Neat Download Manager',
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/neea/index.js b/lib/v2/neea/index.js
index ee47ab31e3..60c30682c2 100644
--- a/lib/v2/neea/index.js
+++ b/lib/v2/neea/index.js
@@ -1,10 +1,10 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-function load(link, ctx) {
+import got from '@/utils/got';
+import { load } from 'cheerio';
+function loadContent(link, ctx) {
return ctx.cache.tryGet(link, async () => {
// 开始加载页面
const response = await got.get(link);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
// 获取标题
const title = $('#Content1 > div > ul > li > h1').text();
// 获取正文内容
@@ -19,7 +19,7 @@ function load(link, ctx) {
}
module.exports = async (ctx) => {
- const type = ctx.params.type;
+ const type = ctx.req.param('type');
const host = `http://${type}.neea.edu.cn${typeDic[type].url}`;
const response = await got({
method: 'get',
@@ -27,7 +27,7 @@ module.exports = async (ctx) => {
});
const data = response.data;
- const $ = cheerio.load(data);
+ const $ = load(data);
const list = $(`#ReportIDname > a`).parent().parent().get();
const process = await Promise.all(
@@ -43,16 +43,16 @@ module.exports = async (ctx) => {
guid: itemUrl,
pubDate: new Date(time).toUTCString(),
};
- const other = await load(String(itemUrl), ctx);
+ const other = await loadContent(String(itemUrl), ctx);
return Object.assign({}, single, other);
})
);
- ctx.state.data = {
+ ctx.set('data', {
title: `${typeDic[String(type)].title}动态`,
link: host,
description: `${typeDic[String(type)].title}动态 `,
item: process,
- };
+ });
};
const typeDic = {
diff --git a/lib/v2/neea/jlpt.js b/lib/v2/neea/jlpt.js
index 0865392fde..73608e5944 100644
--- a/lib/v2/neea/jlpt.js
+++ b/lib/v2/neea/jlpt.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const rootUrl = 'https://news.neea.cn';
@@ -11,7 +11,7 @@ module.exports = async (ctx) => {
url: currentUrl,
});
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
let items = $('a')
.toArray()
@@ -35,7 +35,7 @@ module.exports = async (ctx) => {
url: item.link,
});
- const content = cheerio.load(detailResponse.data);
+ const content = load(detailResponse.data);
item.description = content('.dvContent').html();
@@ -44,9 +44,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: '重要通知 - 教育部考试中心日本语能力测试',
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/nenu/sohac.js b/lib/v2/nenu/sohac.js
index a3b35baea9..a013a8c6c6 100644
--- a/lib/v2/nenu/sohac.js
+++ b/lib/v2/nenu/sohac.js
@@ -1,9 +1,9 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
- const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 10;
+ const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 10;
const path = ctx.path === '/sohac' ? '/index/tzgg' : ctx.path.replace(/^\/sohac/, '');
@@ -15,7 +15,7 @@ module.exports = async (ctx) => {
url: currentUrl,
});
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
let items = $('span.data')
.slice(0, limit)
@@ -37,7 +37,7 @@ module.exports = async (ctx) => {
url: item.link,
});
- const content = cheerio.load(detailResponse.data);
+ const content = load(detailResponse.data);
item.title = content('.biaoti').text();
item.description = content('.v_news_content').html();
@@ -52,9 +52,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: $('title').text(),
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/nenu/yjsy.js b/lib/v2/nenu/yjsy.js
index 93fd02bb67..6a90b985b3 100644
--- a/lib/v2/nenu/yjsy.js
+++ b/lib/v2/nenu/yjsy.js
@@ -1,9 +1,9 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
- const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 10;
+ const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 10;
const path = ctx.path === '/yjsy' ? '/tzgg' : ctx.path.replace(/^\/yjsy/, '');
@@ -15,7 +15,7 @@ module.exports = async (ctx) => {
url: currentUrl,
});
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
let items = $('a.tit')
.slice(0, limit)
@@ -40,7 +40,7 @@ module.exports = async (ctx) => {
url: item.link,
});
- const content = cheerio.load(detailResponse.data);
+ const content = load(detailResponse.data);
item.title = content('h2').text();
item.description = content('.v_news_content').html();
@@ -56,9 +56,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: $('title').text(),
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/netflav/index.js b/lib/v2/netflav/index.js
index 52cd727bc3..21ff740e1d 100644
--- a/lib/v2/netflav/index.js
+++ b/lib/v2/netflav/index.js
@@ -1,14 +1,14 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
module.exports = async (ctx) => {
const baseUrl = 'https://netflav.com';
const { data } = await got(baseUrl);
- const $ = cheerio.load(data);
+ const $ = load(data);
const nextData = JSON.parse($('#__NEXT_DATA__').text());
const {
head,
@@ -27,7 +27,7 @@ module.exports = async (ctx) => {
category: [...new Set(item.tags?.map((t) => t.replace(/^(\w{2}:)/, '')))],
}));
- ctx.state.data = {
+ ctx.set('data', {
title: head.find((h) => h[0] === 'title')[1].children,
description: head.find((h) => h[0] === 'meta' && h[1].name === 'description')[1].content,
logo: `${baseUrl}${head.find((h) => h[0] === 'meta' && h[1].property === 'og:image')[1].content}`,
@@ -35,5 +35,5 @@ module.exports = async (ctx) => {
link: baseUrl,
item: items,
allowEmpty: true,
- };
+ });
};
diff --git a/lib/v2/neu/bmie.js b/lib/v2/neu/bmie.js
index 4333878c18..dfc2da4663 100644
--- a/lib/v2/neu/bmie.js
+++ b/lib/v2/neu/bmie.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
const baseUrl = 'http://www.bmie.neu.edu.cn';
@@ -23,7 +23,7 @@ const map = {
};
module.exports = async (ctx) => {
- let type = ctx.params.type;
+ let type = ctx.req.param('type');
if (map[type] !== undefined) {
type = map[type];
}
@@ -31,18 +31,18 @@ module.exports = async (ctx) => {
const response = await got(newsUrl);
const data = response.data;
- const $ = cheerio.load(data);
+ const $ = load(data);
const title = $('title').text();
const items = $('#subIndex > div.main_frame_sub > div.detail_sub > div > div > div > ul > li').slice(0, 7).get();
const results = await Promise.all(
items.map(async (item) => {
- const $ = cheerio.load(item);
+ const $ = load(item);
const title = $('a').attr('title');
const url = baseUrl + $('a').attr('href');
const data = await ctx.cache.tryGet(url, async () => {
const result = await got(url);
- const $ = cheerio.load(result.data);
+ const $ = load(result.data);
const info = $($('.ny_con p')[1]).text();
const s = info.search(/\d{4}-\d{2}-\d{2}/);
@@ -86,9 +86,9 @@ module.exports = async (ctx) => {
return result;
})
);
- ctx.state.data = {
+ ctx.set('data', {
title: `东北大学 医学与生物信息工程学院 ${title}`,
link: newsUrl,
item: results,
- };
+ });
};
diff --git a/lib/v2/neu/news.js b/lib/v2/neu/news.js
index 9545c38b75..7ee5847d01 100644
--- a/lib/v2/neu/news.js
+++ b/lib/v2/neu/news.js
@@ -1,15 +1,15 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
const baseUrl = 'https://neunews.neu.edu.cn';
module.exports = async (ctx) => {
- const type = ctx.params.type;
+ const type = ctx.req.param('type');
const newsUrl = `${baseUrl}/${type}/list.htm`;
const response = await got(newsUrl);
const data = response.data;
- const $ = cheerio.load(data);
+ const $ = load(data);
const items = $('.column-news-list > .news_list > .news')
.toArray()
@@ -26,7 +26,7 @@ module.exports = async (ctx) => {
items.map((item) =>
ctx.cache.tryGet(item.link, async () => {
const result = await got(item.link);
- const $ = cheerio.load(result.data);
+ const $ = load(result.data);
item.author = $('.arti-metas').text().split('更新日期')[0];
item.description = $('.article_content').html();
@@ -36,9 +36,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: `东北大学新闻网-${$('head title').text()}`,
link: newsUrl,
item: results,
- };
+ });
};
diff --git a/lib/v2/newmuseum/exhibitions.js b/lib/v2/newmuseum/exhibitions.js
index 7798526cc8..5aaf1486ec 100644
--- a/lib/v2/newmuseum/exhibitions.js
+++ b/lib/v2/newmuseum/exhibitions.js
@@ -2,7 +2,7 @@ const buildData = require('@/utils/common-config');
module.exports = async (ctx) => {
let link;
- const state = ctx.query.state;
+ const state = ctx.req.query('state');
switch (state) {
case undefined:
diff --git a/lib/v2/newrank/douyin.js b/lib/v2/newrank/douyin.js
index 05a31f5992..74446acf32 100644
--- a/lib/v2/newrank/douyin.js
+++ b/lib/v2/newrank/douyin.js
@@ -1,12 +1,12 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
const utils = require('./utils');
-const config = require('@/config').value;
+import { config } from '@/config';
module.exports = async (ctx) => {
if (!config.newrank || !config.newrank.cookie) {
throw new Error('newrank RSS is disabled due to the lack of relevant config');
}
- const uid = ctx.params.dyid;
+ const uid = ctx.req.param('dyid');
const nonce = utils.random_nonce(9);
const url_detail = 'https://xd.newrank.cn/xdnphb/nr/cloud/douyin/detail/aweme?xyz=' + utils.decrypt_douyin_detail_xyz(nonce) + '&nonce=' + nonce;
const cookie = config.newrank.cookie;
@@ -54,10 +54,10 @@ module.exports = async (ctx) => {
pubDate: item.create_time,
}));
- ctx.state.data = {
+ ctx.set('data', {
title: name + ' - 抖音',
description,
link: 'https://xd.newrank.cn/data/d/account/workList/' + uid,
item: items,
- };
+ });
};
diff --git a/lib/v2/newrank/utils.js b/lib/v2/newrank/utils.js
index f7c5822db7..d677e3fb3c 100644
--- a/lib/v2/newrank/utils.js
+++ b/lib/v2/newrank/utils.js
@@ -1,6 +1,6 @@
-const md5 = require('@/utils/md5');
-const got = require('@/utils/got');
-const config = require('@/config').value;
+import md5 from '@/utils/md5';
+import got from '@/utils/got';
+import { config } from '@/config';
const newrank_cookie_token = 'newrank_cookie_token';
const query_count = 'newrank_cookie_count';
const max_query_count = 30;
diff --git a/lib/v2/newrank/wechat.js b/lib/v2/newrank/wechat.js
index ddb57cd9dc..7c73e4b130 100644
--- a/lib/v2/newrank/wechat.js
+++ b/lib/v2/newrank/wechat.js
@@ -1,14 +1,14 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
const { finishArticleItem } = require('@/utils/wechat-mp');
-const cheerio = require('cheerio');
+import { load } from 'cheerio';
const utils = require('./utils');
-const config = require('@/config').value;
+import { config } from '@/config';
module.exports = async (ctx) => {
if (!config.newrank || !config.newrank.cookie) {
throw new Error('newrank RSS is disabled due to the lack of relevant config');
}
- const uid = ctx.params.wxid;
+ const uid = ctx.req.param('wxid');
const nonce = utils.random_nonce(9);
const { data: summaryHTML } = await got({
method: 'get',
@@ -18,7 +18,7 @@ module.exports = async (ctx) => {
Cookie: config.newrank.cookie,
},
});
- const summary$ = cheerio.load(summaryHTML);
+ const summary$ = load(summaryHTML);
const mainsrc = summary$('script')
.toArray()
.find((item) => (item.attribs.src || '').startsWith('/new/static/js/main.')).attribs.src;
@@ -57,9 +57,9 @@ module.exports = async (ctx) => {
}));
await Promise.all(items.map((item) => finishArticleItem(item)));
- ctx.state.data = {
+ ctx.set('data', {
title: name + ' - 微信公众号',
link: `https://www.newrank.cn/new/readDetial?account=${uid}`,
item: items,
- };
+ });
};
diff --git a/lib/v2/news/xhsxw.js b/lib/v2/news/xhsxw.js
index cc41e7af3c..ddc705570e 100644
--- a/lib/v2/news/xhsxw.js
+++ b/lib/v2/news/xhsxw.js
@@ -1,19 +1,19 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const timezone = require('@/utils/timezone');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import timezone from '@/utils/timezone';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
module.exports = async (ctx) => {
- const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 100;
+ const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 100;
const rootUrl = 'http://www.news.cn';
const currentUrl = new URL('xhsxw.htm', rootUrl).href;
const { data: currentResponse } = await got(currentUrl);
- const $ = cheerio.load(currentResponse);
+ const $ = load(currentResponse);
const id = $('ul.wz-list')
.prop('data')
@@ -48,7 +48,7 @@ module.exports = async (ctx) => {
try {
const { data: detailResponse } = await got(item.link);
- const content = cheerio.load(detailResponse);
+ const content = load(detailResponse);
item.description += art(path.join(__dirname, 'templates/description.art'), {
description: content('#detailContent').html(),
@@ -66,7 +66,7 @@ module.exports = async (ctx) => {
const image = new URL('20141223_xhsxw_logo_v1.png', rootUrl).href;
const icon = new URL('favicon.ico', rootUrl).href;
- ctx.state.data = {
+ ctx.set('data', {
item: items,
title,
link: currentUrl,
@@ -77,5 +77,5 @@ module.exports = async (ctx) => {
logo: icon,
author: title.split(/_/).pop(),
allowEmpty: true,
- };
+ });
};
diff --git a/lib/v2/newsmarket/index.js b/lib/v2/newsmarket/index.js
index 0c3de57d83..fff65a6257 100644
--- a/lib/v2/newsmarket/index.js
+++ b/lib/v2/newsmarket/index.js
@@ -1,9 +1,9 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
- const category = ctx.params.category ?? '';
+ const category = ctx.req.param('category') ?? '';
const rootUrl = 'https://www.newsmarket.com.tw';
const currentUrl = `${rootUrl}${category ? `/blog/category/${category}` : ''}`;
@@ -13,10 +13,10 @@ module.exports = async (ctx) => {
url: currentUrl,
});
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('.title a')
- .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 20)
+ .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 20)
.map((_, item) => {
item = $(item);
@@ -36,7 +36,7 @@ module.exports = async (ctx) => {
url: item.link,
});
- const content = cheerio.load(detailResponse.data);
+ const content = load(detailResponse.data);
content('figure img').each(function () {
content(this)
@@ -55,9 +55,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: $('title').text(),
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/newzmz/index.js b/lib/v2/newzmz/index.js
index 4b7d35c9dc..dcfdc672e7 100644
--- a/lib/v2/newzmz/index.js
+++ b/lib/v2/newzmz/index.js
@@ -1,11 +1,11 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
const { rootUrl, getItems, getItemInfo, processItems } = require('./util');
module.exports = async (ctx) => {
const { id = '1', downLinkType = '磁力链' } = ctx.params;
- const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 50;
+ const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 50;
// If the id is not composed solely of digits,
// then consider it as the id of a movie or TV show;
@@ -21,7 +21,7 @@ module.exports = async (ctx) => {
return response;
});
- const $ = cheerio.load(response);
+ const $ = load(response);
// If a category id is specified,
// retrieve all movies and TV shows from that category
@@ -50,7 +50,7 @@ module.exports = async (ctx) => {
const title = `${$('title').text()}${headerTitle ? ` - ${headerTitle}` : ''}`;
const icon = $('link[rel="shortcut icon"]').prop('href');
- ctx.state.data = {
+ ctx.set('data', {
item: isCategory ? items : items.slice(0, limit),
title,
link: currentUrl,
@@ -62,5 +62,5 @@ module.exports = async (ctx) => {
subtitle: $('meta[name="keywords"]').prop('content'),
author: title,
allowEmpty: true,
- };
+ });
};
diff --git a/lib/v2/newzmz/util.js b/lib/v2/newzmz/util.js
index 7488134473..de580ea0e1 100644
--- a/lib/v2/newzmz/util.js
+++ b/lib/v2/newzmz/util.js
@@ -1,7 +1,7 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
const rootUrl = 'https://nzmz.xyz';
@@ -22,7 +22,7 @@ const getItems = async (tryGet, homeUrl, id, modSelector, itemSelector) => {
return response;
});
- const $ = cheerio.load(response);
+ const $ = load(response);
return $(modSelector)
.eq(Number.parseInt(id, 10))
@@ -47,7 +47,7 @@ const getItemInfo = (tryGet, itemUrl) =>
tryGet(`newzmz#${itemUrl.match(/details-(.*?)\.html/)[1]}`, async () => {
const { data: detailResponse } = await got(itemUrl);
- const content = cheerio.load(detailResponse);
+ const content = load(detailResponse);
const nameZh = content('div.chsname').text();
const nameEn = content('div.engname').text();
@@ -107,7 +107,7 @@ const getItemInfo = (tryGet, itemUrl) =>
const processItems = async (i, downLinkType, itemSelector, categorySelector, downLinkSelector) => {
const { data: detailResponse } = await got(i.link);
- const content = cheerio.load(detailResponse);
+ const content = load(detailResponse);
return content(itemSelector)
.toArray()
diff --git a/lib/v2/nextapple/realtime.js b/lib/v2/nextapple/realtime.js
index 7c5b306a82..408d211daf 100644
--- a/lib/v2/nextapple/realtime.js
+++ b/lib/v2/nextapple/realtime.js
@@ -1,19 +1,19 @@
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
+import { load } from 'cheerio';
const asyncPool = require('tiny-async-pool');
module.exports = async (ctx) => {
- const category = ctx.params.category ?? 'latest';
+ const category = ctx.req.param('category') ?? 'latest';
const currentUrl = `https://tw.nextapple.com/realtime/${category}`;
const response = await got(currentUrl);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const items = [];
for await (const item of asyncPool(5, $('article.infScroll'), (item) => {
const link = $(item).find('.post-title').attr('href');
return ctx.cache.tryGet(link, async () => {
const response = await got(link);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const mainContent = $('#main-content');
const titleElement = mainContent.find('header h1');
const title = titleElement.text();
@@ -36,9 +36,9 @@ module.exports = async (ctx) => {
items.push(item);
}
- ctx.state.data = {
+ ctx.set('data', {
title: $('title').text(),
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/nga/forum.js b/lib/v2/nga/forum.js
index 16ed64ee37..9a3b7fcd11 100644
--- a/lib/v2/nga/forum.js
+++ b/lib/v2/nga/forum.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const config = require('@/config').value;
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { config } from '@/config';
+import { parseDate } from '@/utils/parse-date';
const X_UA = 'NGA_skull/6.0.5(iPhone10,3;iOS 12.0.1)';
@@ -62,10 +62,10 @@ module.exports = async (ctx) => {
})
);
- ctx.state.data = {
+ ctx.set('data', {
title: `NGA-${forumname}${recommend ? '-精华' : ''}`,
link: `https://nga.178.com/thread.php?fid=${fid}`,
description: 'NGA是国内专业的游戏玩家社区,魔兽世界,英雄联盟,炉石传说,风暴英雄,暗黑破坏神3(D3)游戏攻略讨论,以及其他热门游戏玩家社区',
item: resultItem,
- };
+ });
};
diff --git a/lib/v2/nga/post.js b/lib/v2/nga/post.js
index 1c8fbac05e..186d2ada9d 100644
--- a/lib/v2/nga/post.js
+++ b/lib/v2/nga/post.js
@@ -1,9 +1,9 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
const iconv = require('iconv-lite');
-const { parseDate } = require('@/utils/parse-date');
-const timezone = require('@/utils/timezone');
-const config = require('@/config').value;
+import { parseDate } from '@/utils/parse-date';
+import timezone from '@/utils/timezone';
+import { config } from '@/config';
module.exports = async (ctx) => {
const getPageUrl = (tid, authorId, page = 1, hash = '') => `https://nga.178.com/read.php?tid=${tid}&page=${page}${authorId ? `&authorid=${authorId}` : ''}&rand=${Math.random() * 1000}#${hash}`;
@@ -22,7 +22,7 @@ module.exports = async (ctx) => {
});
const htmlString = iconv.decode(response.data, 'gbk');
- return cheerio.load(htmlString);
+ return load(htmlString);
};
const getLastPageId = async (tid, authorId) => {
@@ -72,8 +72,8 @@ module.exports = async (ctx) => {
return str;
};
- const tid = ctx.params.tid;
- const authorId = ctx.params.authorId || undefined;
+ const tid = ctx.req.param('tid');
+ const authorId = ctx.req.param('authorId') || undefined;
const pageId = await getLastPageId(tid, authorId);
const $ = await getPage(tid, authorId, pageId);
@@ -103,7 +103,7 @@ module.exports = async (ctx) => {
const pubDate = timezone(parseDate(post.find('.postInfo > span').first().text(), 'YYYY-MM-DD HH:mm'), +8);
return {
- title: cheerio.load(description).text(),
+ title: load(description).text(),
author: poster,
link,
description,
@@ -114,9 +114,9 @@ module.exports = async (ctx) => {
const rssTitle = authorName ? `NGA ${authorName} ${title}` : `NGA ${title}`;
- ctx.state.data = {
+ ctx.set('data', {
title: rssTitle,
link: getPageUrl(tid, authorId, pageId),
item: items.get(),
- };
+ });
};
diff --git a/lib/v2/ngocn2/index.js b/lib/v2/ngocn2/index.js
index 74a050ba83..fd87b6ee27 100644
--- a/lib/v2/ngocn2/index.js
+++ b/lib/v2/ngocn2/index.js
@@ -1,9 +1,9 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
- const category = ctx.params.category ?? 'article';
+ const category = ctx.req.param('category') ?? 'article';
const rootUrl = 'https://ngocn2.org';
const currentUrl = `${rootUrl}/${category}`;
@@ -13,7 +13,7 @@ module.exports = async (ctx) => {
url: currentUrl,
});
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('.articleroll__article a')
.map((_, item) => {
@@ -35,7 +35,7 @@ module.exports = async (ctx) => {
url: item.link,
});
- const content = cheerio.load(detailResponse.data);
+ const content = load(detailResponse.data);
content('.gatsby-resp-image-link').each(function () {
content(this).html(`.find('img').attr('src')})
`);
@@ -48,9 +48,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: `${$('.sectitle__content').text()} - NGOCN`,
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/nhentai/other.js b/lib/v2/nhentai/other.js
index f59aa429a6..8f489b473f 100644
--- a/lib/v2/nhentai/other.js
+++ b/lib/v2/nhentai/other.js
@@ -13,7 +13,7 @@ module.exports = async (ctx) => {
const simples = await getSimple(url);
- const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 5;
+ const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 5;
let items = simples;
if (mode === 'detail') {
items = await getDetails(ctx.cache, simples, limit);
@@ -21,10 +21,10 @@ module.exports = async (ctx) => {
items = await getTorrents(ctx.cache, simples, limit);
}
- ctx.state.data = {
+ ctx.set('data', {
title: `nhentai - ${key} - ${keyword}`,
link: url,
description: 'hentai',
item: items,
- };
+ });
};
diff --git a/lib/v2/nhentai/search.js b/lib/v2/nhentai/search.js
index 7712c2c85e..f414122750 100644
--- a/lib/v2/nhentai/search.js
+++ b/lib/v2/nhentai/search.js
@@ -7,7 +7,7 @@ module.exports = async (ctx) => {
const simples = await getSimple(url);
- const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 5;
+ const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 5;
let items = simples;
if (mode === 'detail') {
items = await getDetails(ctx.cache, simples, limit);
@@ -15,9 +15,9 @@ module.exports = async (ctx) => {
items = await getTorrents(ctx.cache, simples, limit);
}
- ctx.state.data = {
+ ctx.set('data', {
title: `nhentai - search - ${keyword}`,
link: url,
item: items,
- };
+ });
};
diff --git a/lib/v2/nhentai/util.js b/lib/v2/nhentai/util.js
index ddc30b4f06..f7befcaa54 100644
--- a/lib/v2/nhentai/util.js
+++ b/lib/v2/nhentai/util.js
@@ -1,8 +1,8 @@
-const cheerio = require('cheerio');
-const got = require('@/utils/got');
-const config = require('@/config').value;
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import { load } from 'cheerio';
+import got from '@/utils/got';
+import { config } from '@/config';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
const baseUrl = 'https://nhentai.net';
@@ -74,7 +74,7 @@ const gotByIp = (url, ...options) =>
const getSimple = async (url) => {
const { data } = await gotByIp(url);
- const $ = cheerio.load(data);
+ const $ = load(data);
return $('.gallery a.cover')
.toArray()
@@ -120,7 +120,7 @@ const getTorrent = async (simple, cookie) => {
const getDetail = async (simple) => {
const { link } = simple;
const { data } = await gotByIp(link);
- const $ = cheerio.load(data);
+ const $ = load(data);
const galleryImgs = $('.gallerythumb img')
.toArray()
diff --git a/lib/v2/nhk/news-web-easy.js b/lib/v2/nhk/news-web-easy.js
index 0bd5a78239..5cc876dc33 100644
--- a/lib/v2/nhk/news-web-easy.js
+++ b/lib/v2/nhk/news-web-easy.js
@@ -1,8 +1,8 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const timezone = require('@/utils/timezone');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import timezone from '@/utils/timezone';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
module.exports = async (ctx) => {
@@ -27,23 +27,23 @@ module.exports = async (ctx) => {
return acc;
}, []);
- items = items.sort((a, b) => b.pubDate - a.pubDate).slice(0, ctx.query.limit ? Number(ctx.query.limit) : 30);
+ items = items.sort((a, b) => b.pubDate - a.pubDate).slice(0, ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 30);
items = await Promise.all(
items.map((item) =>
ctx.cache.tryGet(item.link, async () => {
const { data } = await got(item.link);
- const $ = cheerio.load(data);
+ const $ = load(data);
item.description += $('.article-body').html();
return item;
})
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: 'NEWS WEB EASY',
link: 'https://www3.nhk.or.jp/news/easy/',
description: 'NEWS WEB EASYは、小学生・中学生の皆さんや、日本に住んでいる外国人のみなさんに、わかりやすいことば でニュースを伝えるウェブサイトです。',
item: items,
- };
+ });
};
diff --git a/lib/v2/nhk/news.js b/lib/v2/nhk/news.js
index 455d7ab6ea..9f1672fa28 100644
--- a/lib/v2/nhk/news.js
+++ b/lib/v2/nhk/news.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
const baseUrl = 'https://www3.nhk.or.jp';
const apiUrl = 'https://nwapi.nhk.jp';
@@ -33,9 +33,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: `${Object.values(meta.data.config.navigation.header).find((h) => h.keyname === 'topstories')?.name} | NHK WORLD-JAPAN News`,
link: `${baseUrl}/nhkworld/${lang}/news/list/`,
item: items,
- };
+ });
};
diff --git a/lib/v2/niaogebiji/cat.js b/lib/v2/niaogebiji/cat.js
index d13cc6b55c..b3a82b8f9f 100644
--- a/lib/v2/niaogebiji/cat.js
+++ b/lib/v2/niaogebiji/cat.js
@@ -1,14 +1,14 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
-const timezone = require('@/utils/timezone');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import timezone from '@/utils/timezone';
module.exports = async (ctx) => {
- const categoryId = ctx.params.cat;
+ const categoryId = ctx.req.param('cat');
const link = `https://www.niaogebiji.com/cat/${categoryId}`;
const response = await got(link);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const catName = $('h1').text();
const articles = $('div.articleBox.clearfix')
@@ -34,7 +34,7 @@ module.exports = async (ctx) => {
articles.map((element) =>
ctx.cache.tryGet(element.link, async () => {
const response = await got(element.link);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
element.pubDate = timezone(parseDate($('.writeTime3').text().trim()), 8);
element.description = $('.pc_content').html();
@@ -44,10 +44,10 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: $('head title').text(),
description: $('head meta[name="description"]').attr('content'),
link,
item: items,
- };
+ });
};
diff --git a/lib/v2/niaogebiji/index.js b/lib/v2/niaogebiji/index.js
index 8cfdf89c2f..9391f4f360 100644
--- a/lib/v2/niaogebiji/index.js
+++ b/lib/v2/niaogebiji/index.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const baseUrl = 'https://www.niaogebiji.com';
@@ -24,7 +24,7 @@ module.exports = async (ctx) => {
postList.map((item) =>
ctx.cache.tryGet(item.link, async () => {
const { data: response } = await got(item.link);
- const $ = cheerio.load(response);
+ const $ = load(response);
item.description = $('.pc_content').html();
@@ -33,9 +33,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: '鸟哥笔记',
link: baseUrl,
item: result,
- };
+ });
};
diff --git a/lib/v2/niaogebiji/today.js b/lib/v2/niaogebiji/today.js
index c0323d56b1..85081c6297 100644
--- a/lib/v2/niaogebiji/today.js
+++ b/lib/v2/niaogebiji/today.js
@@ -1,5 +1,5 @@
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const response = await got({
@@ -18,7 +18,7 @@ module.exports = async (ctx) => {
const data = response.data.return_data;
- ctx.state.data = {
+ ctx.set('data', {
title: '鸟哥笔记-今日事',
link: 'https://www.niaogebiji.com/bulletin',
item: data.map((item) => ({
@@ -30,5 +30,5 @@ module.exports = async (ctx) => {
category: item.seo_keywords.split(','),
author: item.user_info.nickname,
})),
- };
+ });
};
diff --git a/lib/v2/nifd/research.js b/lib/v2/nifd/research.js
index 47ba267c47..834215e84b 100644
--- a/lib/v2/nifd/research.js
+++ b/lib/v2/nifd/research.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
const rootUrl = 'http://www.nifd.cn';
@@ -18,11 +18,11 @@ const titleMap = {
};
module.exports = async (ctx) => {
- const categoryGuid = ctx.params.categoryGuid ?? '7a6a826d-b525-42aa-b550-4236e524227f';
+ const categoryGuid = ctx.req.param('categoryGuid') ?? '7a6a826d-b525-42aa-b550-4236e524227f';
const url = `${rootUrl}/Research?categoryGuid=${categoryGuid}`;
const response = await got.get(url);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('div.qr-main-item')
.map((_, item) => ({
title: $(item).find('h2').text(),
@@ -36,7 +36,7 @@ module.exports = async (ctx) => {
list.map((item) =>
ctx.cache.tryGet(item.link, async () => {
const detailResponse = await got.get(item.link);
- const content = cheerio.load(detailResponse.data);
+ const content = load(detailResponse.data);
item.description = content('div.qrd-content').html();
return item;
@@ -44,9 +44,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: `国家金融与发展实验室 - ${titleMap[categoryGuid]}`,
link: url,
item: items,
- };
+ });
};
diff --git a/lib/v2/nikkei/asia/index.js b/lib/v2/nikkei/asia/index.js
index ed5d92887e..e60340957e 100644
--- a/lib/v2/nikkei/asia/index.js
+++ b/lib/v2/nikkei/asia/index.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const currentUrl = 'https://main-asianreview-nikkei.content.pugpig.com/editionfeed/4519/pugpig_atom_contents.json';
@@ -24,7 +24,7 @@ module.exports = async (ctx) => {
item.link = item.shareurl;
item.category = item.section;
- const fulltextcontent = cheerio.load(fulltext.data);
+ const fulltextcontent = load(fulltext.data);
fulltextcontent('.pp-header-group__headline, .lightbox__control, .o-ads, #AdAsia').remove();
fulltextcontent('img').each((_, img) => {
if (img.attribs.full) {
@@ -44,10 +44,10 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: 'Nikkei Asia',
link: 'https://asia.nikkei.com',
image: 'https://main-asianreview-nikkei.content.pugpig.com/pugpig_assets/admin/pub120x120.jpg',
item: items,
- };
+ });
};
diff --git a/lib/v2/nikkei/cn/index.js b/lib/v2/nikkei/cn/index.js
index 30ad120fb6..a7b3734121 100644
--- a/lib/v2/nikkei/cn/index.js
+++ b/lib/v2/nikkei/cn/index.js
@@ -1,7 +1,7 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const timezone = require('@/utils/timezone');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import timezone from '@/utils/timezone';
+import { parseDate } from '@/utils/parse-date';
const parser = require('@/utils/rss-parser');
module.exports = async (ctx) => {
@@ -15,7 +15,7 @@ module.exports = async (ctx) => {
language = 'cn';
}
- const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 25;
+ const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 25;
const rootUrl = `https://${language === 'zh' ? 'zh.' : ''}cn.nikkei.com`;
const isOfficialRSS = path === '/rss';
@@ -38,7 +38,7 @@ module.exports = async (ctx) => {
url: currentUrl,
});
- $ = cheerio.load(response.data);
+ $ = load(response.data);
items = $('dt a')
.toArray()
@@ -62,7 +62,7 @@ module.exports = async (ctx) => {
url: `${item.link}?print=1`,
});
- const content = cheerio.load(detailResponse.data);
+ const content = load(detailResponse.data);
const divs = content('#contentDiv div');
divs.first().remove();
@@ -82,10 +82,10 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: isOfficialRSS ? officialFeed.title : $('title').first().text(),
description: isOfficialRSS ? officialFeed.description : '',
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/nikkei/index.js b/lib/v2/nikkei/index.js
index 9b201d3aa1..a614bfbaa6 100644
--- a/lib/v2/nikkei/index.js
+++ b/lib/v2/nikkei/index.js
@@ -1,10 +1,10 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
module.exports = async (ctx) => {
const url = 'https://www.nikkei.com';
const response = await got(url);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('a[data-rn-inview-track-value]')
.toArray()
@@ -28,9 +28,9 @@ module.exports = async (ctx) => {
};
});
- ctx.state.data = {
+ ctx.set('data', {
title: '日本経済新聞',
link: url,
item: list,
- };
+ });
};
diff --git a/lib/v2/nikkei/news.js b/lib/v2/nikkei/news.js
index c820e149f3..6cd1a73217 100644
--- a/lib/v2/nikkei/news.js
+++ b/lib/v2/nikkei/news.js
@@ -1,7 +1,7 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
module.exports = async (ctx) => {
@@ -12,7 +12,7 @@ module.exports = async (ctx) => {
const response = await got(url);
const data = response.data;
- const $ = cheerio.load(data);
+ const $ = load(data);
let categoryName = '';
const listSelector = $('div#CONTENTS_MAIN').children('div.m-miM09').not('.PRa');
@@ -61,7 +61,7 @@ module.exports = async (ctx) => {
list.map((item) =>
ctx.cache.tryGet(item.link, async () => {
const { data: response } = await got(item.link);
- const $ = cheerio.load(response);
+ const $ = load(response);
$('.notFloated_n1oadkwi').remove();
@@ -76,12 +76,12 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: '日本経済新聞 - ' + categoryName,
description: $('meta[name="description"]').attr('content'),
link: url,
image: $('meta[property="og:image"]').attr('content'),
language: 'ja',
item: article_type === 'free' ? items.filter((item) => !item.paywall) : items,
- };
+ });
};
diff --git a/lib/v2/nintendo/direct.js b/lib/v2/nintendo/direct.js
index c3cd685ebb..b48e1e547d 100644
--- a/lib/v2/nintendo/direct.js
+++ b/lib/v2/nintendo/direct.js
@@ -1,14 +1,14 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
module.exports = async (ctx) => {
const response = await got('https://www.nintendo.com/nintendo-direct/archive/');
const data = response.data;
- const $ = cheerio.load(data);
+ const $ = load(data);
const nextData = JSON.parse($('script#__NEXT_DATA__').text());
delete nextData.props.pageProps.initialApolloState.ROOT_QUERY;
@@ -22,10 +22,10 @@ module.exports = async (ctx) => {
}),
}));
- ctx.state.data = {
+ ctx.set('data', {
title: 'Nintendo Direct（任天堂直面会）',
link: 'https://www.nintendo.com/nintendo-direct/archive/',
description: '最新的任天堂直面会日程信息',
item: result,
- };
+ });
};
diff --git a/lib/v2/nintendo/eshop-cn.js b/lib/v2/nintendo/eshop-cn.js
index 2fa9006da1..7af4a14400 100644
--- a/lib/v2/nintendo/eshop-cn.js
+++ b/lib/v2/nintendo/eshop-cn.js
@@ -1,7 +1,7 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
const util = require('./utils');
const software_url = 'https://www.nintendoswitch.com.cn/software/';
-const { parseDate } = require('@/utils/parse-date');
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const response = await got(software_url);
@@ -35,10 +35,10 @@ module.exports = async (ctx) => {
data = await util.ProcessItemChina(data, ctx.cache);
- ctx.state.data = {
+ ctx.set('data', {
title: 'Nintendo eShop（国服）新游戏',
link: 'https://www.nintendoswitch.com.cn/software',
description: 'Nintendo（国服）新上架的游戏',
item: data,
- };
+ });
};
diff --git a/lib/v2/nintendo/eshop-hk.js b/lib/v2/nintendo/eshop-hk.js
index b36ff92b4c..4842ddd8d6 100644
--- a/lib/v2/nintendo/eshop-hk.js
+++ b/lib/v2/nintendo/eshop-hk.js
@@ -1,19 +1,19 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
module.exports = async (ctx) => {
const response = await got('https://www.nintendo.com.hk/data/json/switch_software.json');
- const data = response.data.filter(({ link }) => link.startsWith('https://')).slice(0, ctx.query.limit ? Number(ctx.query.limit) : 30);
+ const data = response.data.filter(({ link }) => link.startsWith('https://')).slice(0, ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 30);
// 获取游戏描述
const result = await Promise.all(
data.map((item) =>
ctx.cache.tryGet(item.link, async () => {
const { data: response } = await got(item.link);
- const $ = cheerio.load(response);
+ const $ = load(response);
let description;
if (item.link.startsWith('https://store.nintendo.com.hk/')) {
@@ -70,10 +70,10 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: 'Nintendo eShop（港服）新游戏',
link: 'https://www.nintendo.com.hk/software/switch/',
description: 'Nintendo eShop（港服）新上架的游戏',
item: result,
- };
+ });
};
diff --git a/lib/v2/nintendo/eshop-jp.js b/lib/v2/nintendo/eshop-jp.js
index e5e7784e59..e7b8144069 100644
--- a/lib/v2/nintendo/eshop-jp.js
+++ b/lib/v2/nintendo/eshop-jp.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
module.exports = async (ctx) => {
@@ -8,7 +8,7 @@ module.exports = async (ctx) => {
searchParams: {
opt_sshow: 1,
fq: 'ssitu_s:onsale OR ssitu_s:preorder OR memo_bg:forced',
- limit: ctx.query.limit ? Number(ctx.query.limit) : 24,
+ limit: ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 24,
page: 1,
c: '50310840317994813',
opt_osale: 1,
@@ -18,7 +18,7 @@ module.exports = async (ctx) => {
});
const data = response.data.result.items;
- ctx.state.data = {
+ ctx.set('data', {
title: 'Nintendo eShop（日服）新游戏',
link: 'https://www.nintendo.co.jp/software/switch/index.html',
description: 'Nintendo eShop（日服）新上架的游戏',
@@ -30,5 +30,5 @@ module.exports = async (ctx) => {
link: `https://ec.nintendo.com/JP/ja/titles/${item.id}`,
pubDate: parseDate(item.pdate),
})),
- };
+ });
};
diff --git a/lib/v2/nintendo/eshop-us.js b/lib/v2/nintendo/eshop-us.js
index bd57ec5bde..84ff899194 100644
--- a/lib/v2/nintendo/eshop-us.js
+++ b/lib/v2/nintendo/eshop-us.js
@@ -1,5 +1,5 @@
-const { art } = require('@/utils/render');
-const got = require('@/utils/got');
+import { art } from '@/utils/render';
+import got from '@/utils/got';
const path = require('path');
module.exports = async (ctx) => {
@@ -18,7 +18,7 @@ module.exports = async (ctx) => {
});
const data = response.data.hits;
- ctx.state.data = {
+ ctx.set('data', {
title: `Nintendo eShop（美服）新游戏`,
link: `https://www.nintendo.com/store/games/`,
description: `Nintendo eShop（美服）新上架的游戏`,
@@ -27,6 +27,6 @@ module.exports = async (ctx) => {
description: art(path.join(__dirname, 'templates/eshop_us.art'), item),
link: `https://www.nintendo.com${item.url}`,
})),
- };
+ });
ctx.state.json = response.data;
};
diff --git a/lib/v2/nintendo/news-china.js b/lib/v2/nintendo/news-china.js
index 398152a424..510ef16a4b 100644
--- a/lib/v2/nintendo/news-china.js
+++ b/lib/v2/nintendo/news-china.js
@@ -1,4 +1,4 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
const util = require('./utils');
const news_url = 'https://www.nintendoswitch.com.cn';
@@ -26,10 +26,10 @@ module.exports = async (ctx) => {
data = await util.ProcessNewsChina(data, ctx.cache);
- ctx.state.data = {
+ ctx.set('data', {
title: 'Nintendo（中国大陆）主页资讯',
link: 'https://www.nintendoswitch.com.cn',
description: 'Nintendo 中国大陆官网刊登的资讯',
item: data,
- };
+ });
};
diff --git a/lib/v2/nintendo/news.js b/lib/v2/nintendo/news.js
index b374152821..b65287de66 100644
--- a/lib/v2/nintendo/news.js
+++ b/lib/v2/nintendo/news.js
@@ -1,15 +1,15 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
const util = require('./utils');
-const { parseDate } = require('@/utils/parse-date');
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const response = await got('https://www.nintendo.com.hk/data/json/topics.json');
- const data = response.data.filter((val) => val.only_for !== 'tw' && val.url.startsWith('/topics/article/')).slice(0, ctx.query.limit ? Number(ctx.query.limit) : 30);
+ const data = response.data.filter((val) => val.only_for !== 'tw' && val.url.startsWith('/topics/article/')).slice(0, ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 30);
// 获取新闻正文
const result = await util.ProcessNews(data, ctx.cache);
- ctx.state.data = {
+ ctx.set('data', {
title: 'Nintendo（香港）主页资讯',
link: 'https://www.nintendo.com.hk/topics/',
description: 'Nintendo 香港有限公司官网刊登的资讯',
@@ -19,5 +19,5 @@ module.exports = async (ctx) => {
link: `https://www.nintendo.com.hk${item.url}`,
pubDate: parseDate(item.release_date, 'YYYY.M.D'),
})),
- };
+ });
};
diff --git a/lib/v2/nintendo/system-update.js b/lib/v2/nintendo/system-update.js
index 3e17fd8d79..a860e8b70f 100644
--- a/lib/v2/nintendo/system-update.js
+++ b/lib/v2/nintendo/system-update.js
@@ -1,15 +1,15 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
module.exports = async (ctx) => {
const url = 'https://www.nintendo.co.jp/support/switch/system_update/index.html';
const response = await got(url);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('.c-heading-lv3').toArray().slice(1, -2);
- ctx.state.data = {
+ ctx.set('data', {
title: 'Nintendo Switch 本体更新情報',
link: url,
item: list.map((update) => {
@@ -34,5 +34,5 @@ module.exports = async (ctx) => {
pubDate: new Date(Number.parseInt(matched_date[1]), Number.parseInt(matched_date[2]) - 1, Number.parseInt(matched_date[3])),
};
}),
- };
+ });
};
diff --git a/lib/v2/nintendo/utils.js b/lib/v2/nintendo/utils.js
index 6877f3e665..7fd436e407 100644
--- a/lib/v2/nintendo/utils.js
+++ b/lib/v2/nintendo/utils.js
@@ -1,8 +1,8 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
const { JSDOM } = require('jsdom');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
const dayjs = require('dayjs');
const localizedFormat = require('dayjs/plugin/localizedFormat');
@@ -27,12 +27,12 @@ function generateImageLink(link) {
return `
`; } -async function load(link) { +async function loadContent(link) { const response = await got(link); const data = response.data; - const $ = cheerio.load(data); // 使用 cheerio 加载返回的 HTML + const $ = load(data); // 使用 cheerio 加载返回的 HTML const description = $('.description').html(); return { @@ -45,7 +45,7 @@ async function loadNews(link) { const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); let description = $('.detail-body-container').html(); const date = $('.topics-articleHead__date').text(); description = description.replaceAll('src="/topics/', 'src="https://www.nintendo.com.hk/topics/'); @@ -58,7 +58,7 @@ async function loadNews(link) { const ProcessItem = (list, caches) => Promise.all( list.map(async (item) => { - const other = await caches.tryGet(item.link, () => load(item.link)); + const other = await caches.tryGet(item.link, () => loadContent(item.link)); return { ...item, ...other }; }) ); diff --git a/lib/v2/nippon/index.js b/lib/v2/nippon/index.js index 1f154c7916..a90bae6ab3 100644 --- a/lib/v2/nippon/index.js +++ b/lib/v2/nippon/index.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; module.exports = async (ctx) => { - const category = ctx.params.category ?? 'Politics'; + const category = ctx.req.param('category') ?? 'Politics'; const path = category === 'Science,Technology' ? 'condition4' : 'category_code'; const res = await got.get(`https://www.nippon.com/api/search/cn/${path}/20/1/${category}?t=${Date.now()}`); @@ -16,16 +16,16 @@ module.exports = async (ctx) => { list.slice(0, 10).map((item) => ctx.cache.tryGet(item.link, async () => { const res = await got.get(item.link); - const $ = cheerio.load(res.data); + const $ = load(res.data); item.description = $('.editArea').html(); return item; }) ) ); - ctx.state.data = { + ctx.set('data', { title: `走进日本 - ${category}`, link: 'https://www.nippon.com/cn/economy/', item, - }; + }); }; diff --git a/lib/v2/njglyy/utils/index.js b/lib/v2/njglyy/utils/index.js index afa1b215af..f875d0e438 100644 --- a/lib/v2/njglyy/utils/index.js +++ b/lib/v2/njglyy/utils/index.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; async function getNoticeList(ctx, url, host, listSelector, itemSelector, titleSelector, contentSelector) { const response = await got(url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $(listSelector) .toArray() @@ -25,7 +25,7 @@ async function getNoticeList(ctx, url, host, listSelector, itemSelector, titleSe item.link = response.redirectUrls[0]; item.description = '该通知无法直接预览，请点击原文链接↑查看'; } else { - const $ = cheerio.load(response.data); + const $ = load(response.data); item.title = $(contentSelector.title).text(); item.description = $(contentSelector.content) .html() diff --git a/lib/v2/njglyy/ygbjypx.js b/lib/v2/njglyy/ygbjypx.js index 7980635ff4..d277a97ed7 100644 --- a/lib/v2/njglyy/ygbjypx.js +++ b/lib/v2/njglyy/ygbjypx.js @@ -10,9 +10,9 @@ module.exports = async (ctx) => { date: 'span:contains("发布时间")', }); - ctx.state.data = { + ctx.set('data', { title: '南京鼓楼医院 -- 员工版教育培训', link: url, item: out, - }; + }); }; diff --git a/lib/v2/njit/jwc.js b/lib/v2/njit/jwc.js index 65c5b14288..8f4673127a 100644 --- a/lib/v2/njit/jwc.js +++ b/lib/v2/njit/jwc.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const host = 'https://jwc.njit.edu.cn'; module.exports = async (ctx) => { - const type = ctx.params.type ?? 'jx'; + const type = ctx.req.param('type') ?? 'jx'; const link = host + '/index/' + type + '.htm'; const response = await got({ method: 'get', @@ -14,7 +14,7 @@ module.exports = async (ctx) => { rejectUnauthorized: false, }, }); - const $ = cheerio.load(response.body); + const $ = load(response.body); const urlList = $('body') .find('ul li span a') @@ -52,7 +52,7 @@ module.exports = async (ctx) => { }; return single; } - const $ = cheerio.load(response.body); + const $ = load(response.body); const single = { title: $('title').text(), link: itemUrl, @@ -98,9 +98,9 @@ module.exports = async (ctx) => { info = '教学'; break; } - ctx.state.data = { + ctx.set('data', { title: '南京工程学院教务处 -- ' + info, link, item: out, - }; + }); }; diff --git a/lib/v2/njit/tzgg.js b/lib/v2/njit/tzgg.js index 5b26d5c293..509732cd2b 100644 --- a/lib/v2/njit/tzgg.js +++ b/lib/v2/njit/tzgg.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const url = 'https://www.njit.edu.cn/index/tzgg.htm'; const host = 'https://www.njit.edu.cn'; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { rejectUnauthorized: false, }, }); - const $ = cheerio.load(response.body); + const $ = load(response.body); const urlList = $('body') .find('span.text a') @@ -50,7 +50,7 @@ module.exports = async (ctx) => { rejectUnauthorized: false, }, }); - const $ = cheerio.load(response.body); + const $ = load(response.body); const single = { title: $('title').text(), link: itemUrl, @@ -66,9 +66,9 @@ module.exports = async (ctx) => { } }) ); - ctx.state.data = { + ctx.set('data', { title: '南京工程学院 -- 通知公告', url, item: out, - }; + }); }; diff --git a/lib/v2/njnu/ceai/ceai.js b/lib/v2/njnu/ceai/ceai.js index 6390a55ce7..ae303cf285 100644 --- a/lib/v2/njnu/ceai/ceai.js +++ b/lib/v2/njnu/ceai/ceai.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const util = require('./utils'); module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); let title, path; switch (type) { case 'xygg': @@ -29,16 +29,16 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('span a').get(); const result = await util.ProcessFeed(list, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: '南京师范大学计电人院 - ' + title, link: 'http://ceai.njnu.edu.cn/', description: '南京师范大学计电人院', item: result, - }; + }); }; diff --git a/lib/v2/njnu/ceai/utils.js b/lib/v2/njnu/ceai/utils.js index 1a9f2dd735..756543f7bd 100644 --- a/lib/v2/njnu/ceai/utils.js +++ b/lib/v2/njnu/ceai/utils.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; // 专门定义一个function用于加载文章内容 -async function load(link) { +async function loadContent(link) { // 异步请求文章 const response = await got.get(link, { https: { @@ -12,7 +12,7 @@ async function load(link) { }, }); // 加载文章内容 - const $ = cheerio.load(response.data); + const $ = load(response.data); const dateStr = $('#xw_xinxi span:nth-child(1)').text(); // 解析日期 const pubDate = timezone(parseDate(dateStr, 'YYYY-MM-DD', 'zh-cn'), +8); @@ -27,7 +27,7 @@ const ProcessFeed = (list, caches) => Promise.all( // 遍历每一篇文章 list.map(async (item) => { - const $ = cheerio.load(item); + const $ = load(item); const $title = $('a'); // 还原相对链接为绝对链接 @@ -43,7 +43,7 @@ const ProcessFeed = (list, caches) => // 使用tryGet方法从缓存获取内容。 // 当缓存中无法获取到链接内容的时候，则使用load方法加载文章内容。 - const other = await caches.tryGet(itemUrl, () => load(itemUrl)); + const other = await caches.tryGet(itemUrl, () => loadContent(itemUrl)); // 合并解析后的结果集作为该篇文章最终的输出结果 return { ...single, ...other }; diff --git a/lib/v2/njnu/jwc/jwc.js b/lib/v2/njnu/jwc/jwc.js index ae55a7d9c1..a76df84360 100644 --- a/lib/v2/njnu/jwc/jwc.js +++ b/lib/v2/njnu/jwc/jwc.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const util = require('./utils'); module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); let title, path; switch (type) { case 'jstz': @@ -28,16 +28,16 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.list_txt a').get(); const result = await util.ProcessFeed(list, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: '南京师范大学教务处 - ' + title, link: 'http://jwc.njnu.edu.cn/', description: '南京师范大学教务处', item: result, - }; + }); }; diff --git a/lib/v2/njnu/jwc/utils.js b/lib/v2/njnu/jwc/utils.js index a29366436f..579c7d0369 100644 --- a/lib/v2/njnu/jwc/utils.js +++ b/lib/v2/njnu/jwc/utils.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; // 专门定义一个function用于加载文章内容 -async function load(link) { +async function loadContent(link) { // 异步请求文章 const response = await got.get(link, { https: { @@ -12,7 +12,7 @@ async function load(link) { }, }); // 加载文章内容 - const $ = cheerio.load(response.data); + const $ = load(response.data); const dateStr = $('span+ span').text(); // 解析日期 const pubDate = timezone(parseDate(dateStr, 'YYYY-MM-DD', 'zh-cn'), +8); @@ -30,7 +30,7 @@ const ProcessFeed = (list, caches) => { return Promise.all( // 遍历每一篇文章 list.map(async (item) => { - const $ = cheerio.load(item); + const $ = load(item); const $title = $('a'); // 还原相对链接为绝对链接 @@ -46,7 +46,7 @@ const ProcessFeed = (list, caches) => { // 使用tryGet方法从缓存获取内容。 // 当缓存中无法获取到链接内容的时候，则使用load方法加载文章内容。 - const other = await caches.tryGet(itemUrl, () => load(itemUrl)); + const other = await caches.tryGet(itemUrl, () => loadContent(itemUrl)); // 合并解析后的结果集作为该篇文章最终的输出结果 return { ...single, ...other }; diff --git a/lib/v2/nju/admission.js b/lib/v2/nju/admission.js index 4866ba8150..c6fa09e4c5 100644 --- a/lib/v2/nju/admission.js +++ b/lib/v2/nju/admission.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const category_dict = { @@ -12,7 +12,7 @@ module.exports = async (ctx) => { const response = await got(`https://admission.nju.edu.cn/tzgg`); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); let script = $('ul').find('script'); script = script['1'].children[0].data; @@ -31,9 +31,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '本科迎新-通知公告', link: 'https://admission.nju.edu.cn/tzgg', item: items[0], - }; + }); }; diff --git a/lib/v2/nju/dafls.js b/lib/v2/nju/dafls.js index edfda534a2..86c4d1c4e8 100644 --- a/lib/v2/nju/dafls.js +++ b/lib/v2/nju/dafls.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const category_dict = { @@ -13,7 +13,7 @@ module.exports = async (ctx) => { const response = await got(`https://dafls.nju.edu.cn/13167/list.htm`); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('#article97'); // only read first page @@ -29,9 +29,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '大外部-通知公告', link: 'https://dafls.nju.edu.cn/13167/list.htm', item: [...items[0]], - }; + }); }; diff --git a/lib/v2/nju/exchangesys.js b/lib/v2/nju/exchangesys.js index a9ec4bccba..aad47c04a2 100644 --- a/lib/v2/nju/exchangesys.js +++ b/lib/v2/nju/exchangesys.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const dayjs = require('dayjs'); module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); const type_dict = { news: ['http://elite.nju.edu.cn/exchangesystem/index/moreList', 'http://elite.nju.edu.cn/exchangesystem/index/more?type=xw', '新闻通知'], proj: ['http://elite.nju.edu.cn/exchangesystem/index/moreXmList', 'http://elite.nju.edu.cn/exchangesystem/index/more?type=xm', '交换生项目'], @@ -16,7 +16,7 @@ module.exports = async (ctx) => { }, }); - ctx.state.data = { + ctx.set('data', { title: `本科生交换生管理系统-${type_dict[type][2]}`, link: type_dict[type][1], item: @@ -42,5 +42,5 @@ module.exports = async (ctx) => { } return null; }), - }; + }); }; diff --git a/lib/v2/nju/gra.js b/lib/v2/nju/gra.js index fc09613eb0..63ac6195cf 100644 --- a/lib/v2/nju/gra.js +++ b/lib/v2/nju/gra.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const response = await got({ @@ -11,10 +11,10 @@ module.exports = async (ctx) => { const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('li.news'); - ctx.state.data = { + ctx.set('data', { title: '研究生院-动态通知', link: 'https://grawww.nju.edu.cn/905/list.htm', item: list @@ -35,5 +35,5 @@ module.exports = async (ctx) => { }) .get() .filter(Boolean), - }; + }); }; diff --git a/lib/v2/nju/hosptial.js b/lib/v2/nju/hosptial.js index 2d7b9bb416..55ee68085d 100644 --- a/lib/v2/nju/hosptial.js +++ b/lib/v2/nju/hosptial.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const category_dict = { @@ -12,7 +12,7 @@ module.exports = async (ctx) => { const response = await got(`https://hospital.nju.edu.cn/ggtz/index.html`); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); let script = $('div .wrapper').find('script'); script = script['1'].children[0].data; @@ -31,9 +31,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '校医院-公告通知', link: 'https://hospital.nju.edu.cn/ggtz/index.html', item: items[0], - }; + }); }; diff --git a/lib/v2/nju/hqjt.js b/lib/v2/nju/hqjt.js index ea07e66bfa..a2d717a70f 100644 --- a/lib/v2/nju/hqjt.js +++ b/lib/v2/nju/hqjt.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const category_dict = { @@ -13,7 +13,7 @@ module.exports = async (ctx) => { const response = await got(`https://webplus.nju.edu.cn/_s25/zbcg/list.psp`); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('li.news'); // only read first page @@ -29,9 +29,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '后勤集团-招标采购', link: 'https://webplus.nju.edu.cn/_s25/zbcg/list.psp', item: [...items[0]], - }; + }); }; diff --git a/lib/v2/nju/itsc.js b/lib/v2/nju/itsc.js index 7e3f45a786..60d3932e93 100644 --- a/lib/v2/nju/itsc.js +++ b/lib/v2/nju/itsc.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const category_dict = { @@ -13,7 +13,7 @@ module.exports = async (ctx) => { const response = await got(`https://itsc.nju.edu.cn/tzgg/list.htm`); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const tmp = $('.list2')[0].children; const infos = []; for (const element of tmp) { @@ -36,9 +36,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: 'ITSC-公告通知', link: 'https://itsc.nju.edu.cn/tzgg/list.htm', item: items[0], - }; + }); }; diff --git a/lib/v2/nju/jjc.js b/lib/v2/nju/jjc.js index c9fffec4af..d4c6b5667e 100644 --- a/lib/v2/nju/jjc.js +++ b/lib/v2/nju/jjc.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const category_dict = { @@ -15,7 +15,7 @@ module.exports = async (ctx) => { const response = await got(`https://jjc.nju.edu.cn/${c}/list.htm`); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('#wp_news_w6').children().children().children(); // only read first page @@ -32,9 +32,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: `南京大学基建处`, link: 'https://jjc.nju.edu.cn/main.htm', item: [...items[0], ...items[1], ...items[2]], - }; + }); }; diff --git a/lib/v2/nju/jw.js b/lib/v2/nju/jw.js index bf41f5ab16..280da4ea78 100644 --- a/lib/v2/nju/jw.js +++ b/lib/v2/nju/jw.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); const type_dict = { ggtz: [ 26263, // columnID @@ -37,7 +37,7 @@ module.exports = async (ctx) => { }, }); - ctx.state.data = { + ctx.set('data', { title: `本科生院-${type_dict[type][1]}`, link: type_dict[type][4], item: @@ -55,5 +55,5 @@ module.exports = async (ctx) => { } return ret; }), - }; + }); }; diff --git a/lib/v2/nju/rczp.js b/lib/v2/nju/rczp.js index 69f47f22c8..31431d8e95 100644 --- a/lib/v2/nju/rczp.js +++ b/lib/v2/nju/rczp.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const config = require('@/config').value; +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { config } from '@/config'; module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); const title_dict = { xxfb: { title: '信息发布', channelid: '9531,9532,9533,9534,9535,9419' }, jylgw: { title: '教研类岗位', channelid: '9420,9421,9422,9423' }, @@ -40,9 +40,9 @@ module.exports = async (ctx) => { author: item.username, })); - ctx.state.data = { + ctx.set('data', { title: `人才招聘-${title_dict[type].title}`, link, item: items, - }; + }); }; diff --git a/lib/v2/nju/scit.js b/lib/v2/nju/scit.js index bc4f67dc4d..0594892d8d 100644 --- a/lib/v2/nju/scit.js +++ b/lib/v2/nju/scit.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); const type_dict = { tzgg: ['https://scit.nju.edu.cn/10916/list.htm', '通知公告'], kydt: ['https://scit.nju.edu.cn/11003/list.htm', '科研动态'], @@ -16,10 +16,10 @@ module.exports = async (ctx) => { const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('li.list_item'); - ctx.state.data = { + ctx.set('data', { title: `科学技术处-${type_dict[type][1]}`, link: type_dict[type][0], item: list @@ -32,5 +32,5 @@ module.exports = async (ctx) => { }; }) .get(), - }; + }); }; diff --git a/lib/v2/nju/zbb.js b/lib/v2/nju/zbb.js index baa4472a20..31f1a93ef1 100644 --- a/lib/v2/nju/zbb.js +++ b/lib/v2/nju/zbb.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); if (type === 'zfcgyxgk') { const url = `https://zbb.nju.edu.cn/zfcgyxgk/index.chtml`; @@ -15,7 +15,7 @@ module.exports = async (ctx) => { const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('dd[cid]'); ctx.state.data = { @@ -52,7 +52,7 @@ module.exports = async (ctx) => { }); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('dd[cid]'); return list diff --git a/lib/v2/nju/zcc.js b/lib/v2/nju/zcc.js index dfe31cf0bc..e3c95b6d90 100644 --- a/lib/v2/nju/zcc.js +++ b/lib/v2/nju/zcc.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const category_dict = { ggtz: '公告通知', @@ -11,7 +11,7 @@ module.exports = async (ctx) => { const response = await got(`https://zcc.nju.edu.cn/sy/tzzhxx/index.html`); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); let script = $('ul.clearfix').find('script'); script = script['1'].children[0].data; @@ -30,9 +30,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '资产管理处-公告通知', link: 'https://zcc.nju.edu.cn/sy/tzzhxx/index.html', item: items[0], - }; + }); }; diff --git a/lib/v2/njucm/grabs.js b/lib/v2/njucm/grabs.js index e454a07b7d..b1a728ef27 100644 --- a/lib/v2/njucm/grabs.js +++ b/lib/v2/njucm/grabs.js @@ -10,9 +10,9 @@ module.exports = async (ctx) => { date: '.Article_PublishDate', }); - ctx.state.data = { + ctx.set('data', { title: '南京中医药大学 -- 博士招生', link: url, item: out, - }; + }); }; diff --git a/lib/v2/njucm/utils/index.js b/lib/v2/njucm/utils/index.js index ef1327034a..641b1fb125 100644 --- a/lib/v2/njucm/utils/index.js +++ b/lib/v2/njucm/utils/index.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; async function getNoticeList(ctx, url, host, listSelector, titleSelector, contentSelector) { const response = await got(url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $(listSelector) .toArray() @@ -25,7 +25,7 @@ async function getNoticeList(ctx, url, host, listSelector, titleSelector, conten item.link = response.redirectUrls[0]; item.description = '该通知无法直接预览，请点击原文链接↑查看'; } else { - const $ = cheerio.load(response.data); + const $ = load(response.data); item.title = $(contentSelector.title).text(); item.description = $(contentSelector.content) .html() diff --git a/lib/v2/njupt/jwc.js b/lib/v2/njupt/jwc.js index 597a1330a8..b0a1cf47c4 100644 --- a/lib/v2/njupt/jwc.js +++ b/lib/v2/njupt/jwc.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const host = 'https://jwc.njupt.edu.cn'; @@ -10,7 +10,7 @@ const map = { }; module.exports = async (ctx) => { - const type = ctx.params.type ?? 'notice'; + const type = ctx.req.param('type') ?? 'notice'; const link = host + map[type] + '/list.htm'; const response = await got({ method: 'get', @@ -19,7 +19,7 @@ module.exports = async (ctx) => { Referer: host, }, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const urlList = $('.content') .find('a') @@ -54,7 +54,7 @@ module.exports = async (ctx) => { }; return single; } - const $ = cheerio.load(response.data); + const $ = load(response.data); const single = { title: $('.Article_Title').text(), link: itemUrl, @@ -82,9 +82,9 @@ module.exports = async (ctx) => { if (type === 'news') { info = '教务快讯'; } - ctx.state.data = { + ctx.set('data', { title: '南京邮电大学 -- ' + info, link, item: out, - }; + }); }; diff --git a/lib/v2/njust/cwc.js b/lib/v2/njust/cwc.js index d945908e1e..6e50f58798 100644 --- a/lib/v2/njust/cwc.js +++ b/lib/v2/njust/cwc.js @@ -1,6 +1,6 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { getContent } = require('./utils'); const map = new Map([ @@ -11,7 +11,7 @@ const map = new Map([ const host = 'https://cwc.njust.edu.cn'; module.exports = async (ctx) => { - const type = ctx.params.type ?? 'tzgg'; + const type = ctx.req.param('type') ?? 'tzgg'; const info = map.get(type); if (!info) { throw new Error('invalid type'); @@ -20,10 +20,10 @@ module.exports = async (ctx) => { const siteUrl = host + id + '/list.htm'; const html = await getContent(siteUrl, true); - const $ = cheerio.load(html); + const $ = load(html); const list = $('ul.news_list').find('li'); - ctx.state.data = { + ctx.set('data', { title: info.title, link: siteUrl, item: @@ -35,5 +35,5 @@ module.exports = async (ctx) => { link: $(item).find('a').attr('href'), })) .get(), - }; + }); }; diff --git a/lib/v2/njust/dgxg.js b/lib/v2/njust/dgxg.js index f988ee7e3e..9a618855a7 100644 --- a/lib/v2/njust/dgxg.js +++ b/lib/v2/njust/dgxg.js @@ -1,6 +1,6 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { getContent } = require('./utils'); const map = new Map([ @@ -12,7 +12,7 @@ const map = new Map([ const host = 'https://dgxg.njust.edu.cn'; module.exports = async (ctx) => { - const type = ctx.params.type ?? 'gstz'; + const type = ctx.req.param('type') ?? 'gstz'; const info = map.get(type); if (!info) { throw new Error('invalid type'); @@ -21,10 +21,10 @@ module.exports = async (ctx) => { const siteUrl = host + id + '/list.htm'; const html = await getContent(siteUrl, true); - const $ = cheerio.load(html); + const $ = load(html); const list = $('ul.wp_article_list').find('li'); - ctx.state.data = { + ctx.set('data', { title: info.title, link: siteUrl, item: @@ -36,5 +36,5 @@ module.exports = async (ctx) => { link: $(item).find('a').attr('href'), })) .get(), - }; + }); }; diff --git a/lib/v2/njust/eo.js b/lib/v2/njust/eo.js index 6ef358a7da..fde04df4f9 100644 --- a/lib/v2/njust/eo.js +++ b/lib/v2/njust/eo.js @@ -1,6 +1,6 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { getContent } = require('./utils'); const map = new Map([ @@ -17,8 +17,8 @@ const map = new Map([ const host = 'https://dgxg.njust.edu.cn'; module.exports = async (ctx) => { - const grade = ctx.params.grade ?? '17'; - const type = ctx.params.type ?? 'tz'; + const grade = ctx.req.param('grade') ?? '17'; + const type = ctx.req.param('type') ?? 'tz'; let info = map.get(grade + type); if (!info) { // throw new Error('invalid type'); @@ -28,13 +28,13 @@ module.exports = async (ctx) => { const siteUrl = host + id + '/list.htm'; const html = await getContent(siteUrl, true); - const $ = cheerio.load(html); + const $ = load(html); if (!info.title) { info.title = $('title').text(); } const list = $('li.list_item'); - ctx.state.data = { + ctx.set('data', { title: info.title, link: siteUrl, item: @@ -46,5 +46,5 @@ module.exports = async (ctx) => { link: $(item).find('a').attr('href'), })) .get(), - }; + }); }; diff --git a/lib/v2/njust/eoe.js b/lib/v2/njust/eoe.js index eebcb16b2e..8495d1e3a3 100644 --- a/lib/v2/njust/eoe.js +++ b/lib/v2/njust/eoe.js @@ -1,6 +1,6 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { getContent } = require('./utils'); const map = new Map([ @@ -11,7 +11,7 @@ const map = new Map([ const host = 'https://eoe.njust.edu.cn'; module.exports = async (ctx) => { - const type = ctx.params.type ?? 'tzgg'; + const type = ctx.req.param('type') ?? 'tzgg'; const info = map.get(type); if (!info) { throw new Error('invalid type'); @@ -20,10 +20,10 @@ module.exports = async (ctx) => { const siteUrl = host + id + '/list.htm'; const html = await getContent(siteUrl, true); - const $ = cheerio.load(html); + const $ = load(html); const list = $('ul.news_ul').find('li'); - ctx.state.data = { + ctx.set('data', { title: info.title, link: siteUrl, item: @@ -35,5 +35,5 @@ module.exports = async (ctx) => { link: $(item).find('a').attr('href'), })) .get(), - }; + }); }; diff --git a/lib/v2/njust/gs.js b/lib/v2/njust/gs.js index 47c3bf0851..4e3d54e35f 100644 --- a/lib/v2/njust/gs.js +++ b/lib/v2/njust/gs.js @@ -1,17 +1,17 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { getContent } = require('./utils'); const host = 'https://gs.njust.edu.cn'; module.exports = async (ctx) => { - const type = ctx.params.type ?? 'sytzgg_4568'; + const type = ctx.req.param('type') ?? 'sytzgg_4568'; const id = '/' + type; const siteUrl = host + id + '/list.htm'; const html = await getContent(siteUrl); - const $ = cheerio.load(html); + const $ = load(html); const title = '南京理工大学研究生院 -- ' + $('title').text(); const list = $('ul.news_ul').find('li'); @@ -21,7 +21,7 @@ module.exports = async (ctx) => { let desc = ''; if (url.startsWith('/')) { const data = await getContent(host + url); - desc = cheerio.load(data)('.wp_articlecontent').html(); + desc = load(data)('.wp_articlecontent').html(); } return { @@ -33,9 +33,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title, link: siteUrl, item: items, - }; + }); }; diff --git a/lib/v2/njust/jwc.js b/lib/v2/njust/jwc.js index 6053e115a1..213bf81c5d 100644 --- a/lib/v2/njust/jwc.js +++ b/lib/v2/njust/jwc.js @@ -1,6 +1,6 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { getContent } = require('./utils'); const map = new Map([ @@ -13,7 +13,7 @@ const map = new Map([ const host = 'https://jwc.njust.edu.cn'; module.exports = async (ctx) => { - const type = ctx.params.type ?? 'xstz'; + const type = ctx.req.param('type') ?? 'xstz'; const info = map.get(type); if (!info) { throw new Error('invalid type'); @@ -22,10 +22,10 @@ module.exports = async (ctx) => { const siteUrl = host + id + '/list.htm'; const html = await getContent(siteUrl, true); - const $ = cheerio.load(html); + const $ = load(html); const list = $('div#wp_news_w3').find('tr'); - ctx.state.data = { + ctx.set('data', { title: info.title, link: siteUrl, item: @@ -37,5 +37,5 @@ module.exports = async (ctx) => { link: $(item).find('a').attr('href'), })) .get(), - }; + }); }; diff --git a/lib/v2/njust/utils.js b/lib/v2/njust/utils.js index a5af29ea08..957ac2a79c 100644 --- a/lib/v2/njust/utils.js +++ b/lib/v2/njust/utils.js @@ -1,6 +1,9 @@ +import got from '@/utils/got'; +import puppeteer from '@/utils/puppeteer'; + async function getContent(url, pptr = false) { if (pptr) { - const browser = await require('@/utils/puppeteer')({ stealth: true }); + const browser = puppeteer({ stealth: true }); try { const page = await browser.newPage(); // 更改 window.navigator.webdriver 值以避开反爬 @@ -23,7 +26,6 @@ async function getContent(url, pptr = false) { browser.close(); } } else { - const got = require('@/utils/got'); const response = await got(url); const data = response.data; return data; diff --git a/lib/v2/njxzc/home.js b/lib/v2/njxzc/home.js index 28df465d87..049d00b085 100644 --- a/lib/v2/njxzc/home.js +++ b/lib/v2/njxzc/home.js @@ -18,9 +18,9 @@ module.exports = async (ctx) => { '.news_list .news' ); - ctx.state.data = { + ctx.set('data', { title: '南京晓庄学院 -- 通知公告', link: url, item: out, - }; + }); }; diff --git a/lib/v2/njxzc/lib.js b/lib/v2/njxzc/lib.js index bdf482cd5d..583b28389e 100644 --- a/lib/v2/njxzc/lib.js +++ b/lib/v2/njxzc/lib.js @@ -18,9 +18,9 @@ module.exports = async (ctx) => { '.news' ); - ctx.state.data = { + ctx.set('data', { title: '南京晓庄学院 -- 图书馆通知公告', link: url, item: out, - }; + }); }; diff --git a/lib/v2/njxzc/utils/index.js b/lib/v2/njxzc/utils/index.js index 7a0764ec99..3984c10349 100644 --- a/lib/v2/njxzc/utils/index.js +++ b/lib/v2/njxzc/utils/index.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; async function getNoticeList(ctx, url, host, titleSelector, dateSelector, contentSelector, listSelector) { const response = await got(url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $(listSelector) .toArray() @@ -26,7 +26,7 @@ async function getNoticeList(ctx, url, host, titleSelector, dateSelector, conten item.link = response.redirectUrls[0]; item.description = '该通知无法直接预览，请点击原文链接↑查看'; } else { - const $ = cheerio.load(response.data); + const $ = load(response.data); item.title = $(contentSelector.title).text(); item.description = $(contentSelector.content) .html() diff --git a/lib/v2/nltimes/news.js b/lib/v2/nltimes/news.js index 30eb08d970..8aed1e82cf 100644 --- a/lib/v2/nltimes/news.js +++ b/lib/v2/nltimes/news.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const map = new Map([ ['top-stories', { title: 'NL Times -- Top Stories', suffix: '/top-stories' }], @@ -17,7 +17,7 @@ const map = new Map([ ]); module.exports = async (ctx) => { - const category = ctx.params.category ?? 'top-stories'; + const category = ctx.req.param('category') ?? 'top-stories'; const suffix = map.get(category).suffix; const rootUrl = 'https://www.nltimes.nl'; @@ -28,7 +28,7 @@ module.exports = async (ctx) => { url: apiUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.news-card') .slice(0, 10) @@ -49,7 +49,7 @@ module.exports = async (ctx) => { .get(); const ProcessFeed = (data) => { - const $ = cheerio.load(data); + const $ = load(data); return $('.news-article--body').html(); }; @@ -79,11 +79,11 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: map.get(category).title, language: 'en', link: apiUrl, description: map.get(category).title, item: items, - }; + }); }; diff --git a/lib/v2/nmtv/column.js b/lib/v2/nmtv/column.js index 43d30c8c73..0beb9a1501 100644 --- a/lib/v2/nmtv/column.js +++ b/lib/v2/nmtv/column.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { - const id = ctx.params.id ?? '877'; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 100; + const id = ctx.req.param('id') ?? '877'; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 100; const hostUrl = 'https://vod.m2oplus.nmtv.cn'; const apiRootUrl = 'https://mapi.m2oplus.nmtv.cn'; @@ -43,11 +43,11 @@ module.exports = async (ctx) => { const author = data[0].column_name; const imageUrl = data[0].column_info.indexpic; - ctx.state.data = { + ctx.set('data', { title: `内蒙古广播电视台 - ${author}`, link: items[0].link.split(/\/\d{4}-\d{2}-\d{2}\//)[0], item: items, image: `${imageUrl.host}${imageUrl.filepath}${imageUrl.filename}`, itunes_author: author, - }; + }); }; diff --git a/lib/v2/nodejs/blog.js b/lib/v2/nodejs/blog.js index bc63af5c20..c557d2bd69 100644 --- a/lib/v2/nodejs/blog.js +++ b/lib/v2/nodejs/blog.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const language = ctx.params.language ?? 'en'; + const language = ctx.req.param('language') ?? 'en'; const rootUrl = 'https://nodejs.org'; const currentUrl = `${rootUrl}/${language}/blog`; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); $('.summary').remove(); @@ -36,7 +36,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.pubDate = parseDate(content('time').attr('datetime')); item.author = content('.blogpost-meta') @@ -52,9 +52,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'News - Node.js', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/nogizaka46/blog.js b/lib/v2/nogizaka46/blog.js index d02b8ee996..21022789c1 100644 --- a/lib/v2/nogizaka46/blog.js +++ b/lib/v2/nogizaka46/blog.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const rootUrl = 'https://www.nogizaka46.com'; module.exports = async (ctx) => { - const id = ctx.params.id ?? 'all'; + const id = ctx.req.param('id') ?? 'all'; const params = id === 'all' ? '' : `?ct=${id}`; const currentUrl = `${rootUrl}/s/n46/api/list/blog${params}`; @@ -15,7 +15,7 @@ module.exports = async (ctx) => { const list = JSON.parse(response.data.slice(4).slice(0, -2)).data; - ctx.state.data = { + ctx.set('data', { allowEmpty: true, title: '乃木坂46 公式ブログ', link: 'https://www.nogizaka46.com/s/n46/diary/MEMBER', @@ -29,5 +29,5 @@ module.exports = async (ctx) => { description: item.text, guid: rootUrl + new URL(item.link).pathname, })), - }; + }); }; diff --git a/lib/v2/nogizaka46/news.js b/lib/v2/nogizaka46/news.js index 15a5afec76..b68d96e035 100644 --- a/lib/v2/nogizaka46/news.js +++ b/lib/v2/nogizaka46/news.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const rootUrl = 'https://www.nogizaka46.com'; module.exports = async (ctx) => { - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 25; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 25; const response = await got({ method: 'get', @@ -24,10 +24,10 @@ module.exports = async (ctx) => { guid: rootUrl + new URL(item.link_url).pathname, })); - ctx.state.data = { + ctx.set('data', { allowEmpty: true, title: '乃木坂46官网 NEWS', link: 'http://www.nogizaka46.com/news/', item: items, - }; + }); }; diff --git a/lib/v2/notateslaapp/update.js b/lib/v2/notateslaapp/update.js index 9ba8338554..e51e0daffe 100644 --- a/lib/v2/notateslaapp/update.js +++ b/lib/v2/notateslaapp/update.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; module.exports = async (ctx) => { const response = await got({ @@ -12,10 +12,10 @@ module.exports = async (ctx) => { const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('article[id]'); - ctx.state.data = { + ctx.set('data', { title: '特斯拉系统更新', link: 'https://www.notateslaapp.com/software-updates/history/', description: '特斯拉系统更新 - 最新发布', @@ -32,5 +32,5 @@ module.exports = async (ctx) => { }; }) .get(), - }; + }); }; diff --git a/lib/v2/notefolio/search.js b/lib/v2/notefolio/search.js index f204576d72..25ac07eb2e 100644 --- a/lib/v2/notefolio/search.js +++ b/lib/v2/notefolio/search.js @@ -1,9 +1,9 @@ // 导入所需模组 -const got = require('@/utils/got'); // 自订的 got -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; // 自订的 got +import { parseDate } from '@/utils/parse-date'; const dayjs = require('dayjs'); const path = require('path'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; // 分类 const categoryMap = [ @@ -133,12 +133,12 @@ module.exports = async (ctx) => { }; }) || []; - ctx.state.data = { + ctx.set('data', { // 源标题 title: `${category}/${order}/${time}/${query} search`, // 源链接 // link: '', // 源文章 item: items, - }; + }); }; diff --git a/lib/v2/notion/database.js b/lib/v2/notion/database.js index e96035e7ec..1218036eda 100644 --- a/lib/v2/notion/database.js +++ b/lib/v2/notion/database.js @@ -1,10 +1,10 @@ const { Client, isNotionClientError, APIErrorCode } = require('@notionhq/client'); const logger = require('@/utils/logger'); -const config = require('@/config').value; -const { parseDate } = require('@/utils/parse-date'); -const got = require('@/utils/got'); +import { config } from '@/config'; +import { parseDate } from '@/utils/parse-date'; +import got from '@/utils/got'; const { NotionToMarkdown } = require('notion-to-md'); -const cheerio = require('cheerio'); +import { load } from 'cheerio'; const md = require('markdown-it')({ html: true, linkify: true, @@ -15,7 +15,7 @@ module.exports = async (ctx) => { throw new Error('Notion RSS is disabled due to the lack of NOTION_TOKEN(relevant config)'); } - const databaseId = ctx.params.databaseId; + const databaseId = ctx.req.param('databaseId'); const notion_api_key = config.notion.key; const notion = new Client({ @@ -31,12 +31,12 @@ module.exports = async (ctx) => { const image = database.cover?.external.url ?? database.icon?.emoji; // List pages under the database - const databaseQuery = parseCustomQuery(ctx.query.query); + const databaseQuery = parseCustomQuery(ctx.req.query('query')); const { results } = await notion.databases.query({ database_id: databaseId, ...databaseQuery, }); - const customProperties = parseCustomQuery(ctx.query.properties) ?? {}; + const customProperties = parseCustomQuery(ctx.req.query('properties')) ?? {}; const properties = { author: customProperties.author ?? 'Author', link: customProperties.link ?? 'URL', @@ -74,7 +74,7 @@ module.exports = async (ctx) => { method: 'get', url: articleLink, }); - const $ = cheerio.load(response.body); + const $ = load(response.body); const articleAuthor = $('meta[name="author"]').attr('content'); const articlePubTime = $('meta[name="publish_date"], meta[name="date"]').attr('content'); return { @@ -118,9 +118,9 @@ module.exports = async (ctx) => { if (isNotionClientError(error)) { if (error.statusCode === APIErrorCode.ObjectNotFound) { - ctx.throw(404, 'The database is not exist'); + throw new Error('The database is not exist'); } else if (error.statusCode === APIErrorCode.Unauthorized) { - ctx.throw(401, 'Please check the config of NOTION_TOKEN'); + throw new Error('Please check the config of NOTION_TOKEN'); } else { ctx.throw(error.statusCode, 'Notion API Error'); } diff --git a/lib/v2/now/news.js b/lib/v2/now/news.js index a41e116764..4b189ee993 100644 --- a/lib/v2/now/news.js +++ b/lib/v2/now/news.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const categories = { tracker: 123, @@ -9,8 +9,8 @@ const categories = { }; module.exports = async (ctx) => { - const category = ctx.params.category || ''; - const id = ctx.params.id || ''; + const category = ctx.req.param('category') || ''; + const id = ctx.req.param('id') || ''; const rootUrl = 'https://news.now.com'; @@ -21,7 +21,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $(`${category === '' ? '.homeFeaturedNews ' : '.newsCategoryColLeft '}.newsTitle`) .map((_, item) => { @@ -41,7 +41,7 @@ module.exports = async (ctx) => { method: 'get', url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); const images = detailResponse.data.match(/"imageUrl":"(.*?)","image2Url":/); @@ -53,9 +53,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: String(Object.hasOwn(categories, category) ? $('title').text() : ($('.smallSpace.active').text() || '首頁') + ' | Now 新聞'), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/nowcoder/discuss.js b/lib/v2/nowcoder/discuss.js index de495da57a..090a19e2ef 100644 --- a/lib/v2/nowcoder/discuss.js +++ b/lib/v2/nowcoder/discuss.js @@ -1,17 +1,17 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const host = 'https://www.nowcoder.com'; module.exports = async (ctx) => { - const type = ctx.params.type; - const order = ctx.params.order; + const type = ctx.req.param('type'); + const order = ctx.req.param('order'); const link = `https://www.nowcoder.com/discuss?type=${type}&order=${order}`; const response = await got.get(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const type_name = $('a.discuss-tab.selected').text(); const order_name = $('li.selected a').text(); @@ -33,7 +33,7 @@ module.exports = async (ctx) => { return ctx.cache.tryGet(itemUrl, async () => { const response = await got.get(itemUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const date_value = $('span.post-time').text(); @@ -49,9 +49,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: `${type_name}${order_name}——牛客网讨论区`, link, item: out, - }; + }); }; diff --git a/lib/v2/nowcoder/experience.js b/lib/v2/nowcoder/experience.js index ea814662c0..0da57ab346 100644 --- a/lib/v2/nowcoder/experience.js +++ b/lib/v2/nowcoder/experience.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const host = 'https://www.nowcoder.com'; module.exports = async (ctx) => { const params = new URLSearchParams(ctx.query); - params.append('tagId', ctx.params.tagId); + params.append('tagId', ctx.req.param('tagId')); const link = new URL('/discuss/experience/json', host); @@ -31,7 +31,7 @@ module.exports = async (ctx) => { list.map((info) => ctx.cache.tryGet(info.link, async () => { const response = await got.get(info.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); info.description = $('.nc-post-content').html(); @@ -40,9 +40,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { - title: `牛客面经Tag${ctx.params.tagId}`, + ctx.set('data', { + title: `牛客面经Tag${ctx.req.param('tagId')}`, link: link.href, item: out, - }; + }); }; diff --git a/lib/v2/nowcoder/jobcenter.js b/lib/v2/nowcoder/jobcenter.js index 1469a33bdf..50bec560dc 100644 --- a/lib/v2/nowcoder/jobcenter.js +++ b/lib/v2/nowcoder/jobcenter.js @@ -1,17 +1,17 @@ const url = require('url'); -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; module.exports = async (ctx) => { const rootUrl = `https://www.nowcoder.com/job/center/`; - const currentUrl = `${rootUrl}?${ctx.params.type ? 'type=' + ctx.params.type : ''}${ctx.params.city ? '&city=' + ctx.params.city : ''}${ctx.params.order ? '&order=' + ctx.params.order : ''}${ - ctx.params.recruitType ? '&recruitType=' + ctx.params.recruitType : '' - }${ctx.params.latest ? '&latest=' + ctx.params.latest : ''}`; + const currentUrl = `${rootUrl}?${ctx.req.param('type') ? 'type=' + ctx.req.param('type') : ''}${ctx.req.param('city') ? '&city=' + ctx.req.param('city') : ''}${ctx.req.param('order') ? '&order=' + ctx.req.param('order') : ''}${ + ctx.req.param('recruitType') ? '&recruitType=' + ctx.req.param('recruitType') : '' + }${ctx.req.param('latest') ? '&latest=' + ctx.req.param('latest') : ''}`; const response = await got({ method: 'get', url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('ul.reco-job-list li') .slice(0, 30) .map((_, item) => { @@ -42,16 +42,16 @@ module.exports = async (ctx) => { method: 'get', url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('div.rec-job').html(); return item; }) ) ); - ctx.state.data = { - title: `${ctx.params.recruitType ? (ctx.params.recruitType === '2' ? '社招广场' : '实习广场') : '实习广场'} - 牛客网`, + ctx.set('data', { + title: `${ctx.req.param('recruitType') ? (ctx.req.param('recruitType') === '2' ? '社招广场' : '实习广场') : '实习广场'} - 牛客网`, link: rootUrl, item: items, - }; + }); }; diff --git a/lib/v2/nowcoder/recommend.js b/lib/v2/nowcoder/recommend.js index 84b70e788d..da43c5a16e 100644 --- a/lib/v2/nowcoder/recommend.js +++ b/lib/v2/nowcoder/recommend.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; module.exports = async (ctx) => { const link = `https://www.nowcoder.com/recommand/activity?token=&type=3&_=${Date.now()}`; @@ -7,7 +7,7 @@ module.exports = async (ctx) => { throw new Error(`接口错误，错误代码:${responseBody.code},错误原因:${responseBody.msg}`); } const data = responseBody.data.activitys; - ctx.state.data = { + ctx.set('data', { title: '牛客网-推荐', link: 'https://www.nowcoder.com/recommend', description: '牛客网-推荐', @@ -16,5 +16,5 @@ module.exports = async (ctx) => { description: `
`,
link: `https://www.nowcoder.com${item.url}`,
})),
- };
+ });
};
diff --git a/lib/v2/nowcoder/schedule.js b/lib/v2/nowcoder/schedule.js
index 6bd29842ed..2199c91ec6 100644
--- a/lib/v2/nowcoder/schedule.js
+++ b/lib/v2/nowcoder/schedule.js
@@ -1,9 +1,9 @@
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
- const propertyId = ctx.params.propertyId ?? 0;
- const typeId = ctx.params.typeId ?? 0;
+ const propertyId = ctx.req.param('propertyId') ?? 0;
+ const typeId = ctx.req.param('typeId') ?? 0;
const link = `https://www.nowcoder.com/school/schedule/data?token=&query=&typeId=${typeId}&propertyId=${propertyId}&onlyFollow=false&_=${Date.now()}`;
const responseBody = (await got(link)).data;
@@ -12,7 +12,7 @@ module.exports = async (ctx) => {
}
const data = responseBody.data.companyList;
- ctx.state.data = {
+ ctx.set('data', {
title: '名企校招日程',
link: 'https://www.nowcoder.com/school/schedule',
description: '名企校招日程',
@@ -28,5 +28,5 @@ module.exports = async (ctx) => {
link: `https://www.nowcoder.com/school/schedule/${item.id}`,
};
}),
- };
+ });
};
diff --git a/lib/v2/npm/package.js b/lib/v2/npm/package.js
index a087c3deee..9111e8aca5 100644
--- a/lib/v2/npm/package.js
+++ b/lib/v2/npm/package.js
@@ -1,5 +1,5 @@
-const got = require('@/utils/got');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { art } from '@/utils/render';
const path = require('path');
module.exports = async (ctx) => {
@@ -24,7 +24,7 @@ module.exports = async (ctx) => {
}
packageVersionList.reverse();
- ctx.state.data = {
+ ctx.set('data', {
title: `${name} - npm`,
link: `https://www.npmjs.com/package/${name}`,
description: `${name} - npm`,
@@ -41,5 +41,5 @@ module.exports = async (ctx) => {
guid: `https://www.npmjs.com/package/${name}${packageVersion.modified}`,
},
],
- };
+ });
};
diff --git a/lib/v2/npr/full.js b/lib/v2/npr/full.js
index ba56b7bcad..b23a6b0618 100644
--- a/lib/v2/npr/full.js
+++ b/lib/v2/npr/full.js
@@ -1,11 +1,11 @@
const parser = require('@/utils/rss-parser');
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
const getArticleDetail = (link, ctx) =>
ctx.cache.tryGet(link, async () => {
const response = await got(link);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const categories = $('.slug').text().trim();
@@ -58,7 +58,7 @@ const getArticleDetail = (link, ctx) =>
});
module.exports = async (ctx) => {
- const endpoint = ctx.params.endpoint || '1001';
+ const endpoint = ctx.req.param('endpoint') || '1001';
const feed = await parser.parseURL(`https://feeds.npr.org/${endpoint}/rss.xml`);
const items = (
@@ -77,11 +77,11 @@ module.exports = async (ctx) => {
)
).filter(Boolean);
- ctx.state.data = {
+ ctx.set('data', {
title: feed.title,
link: feed.link,
description: feed.description,
icon: 'https://media.npr.org/images/podcasts/primary/npr_generic_image_300.jpg?s=200',
item: items,
- };
+ });
};
diff --git a/lib/v2/ntdtv/channel.js b/lib/v2/ntdtv/channel.js
index 0aea69b6c2..e86d9c4842 100644
--- a/lib/v2/ntdtv/channel.js
+++ b/lib/v2/ntdtv/channel.js
@@ -1,17 +1,17 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
-const timezone = require('@/utils/timezone');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import timezone from '@/utils/timezone';
const host = 'https://www.ntdtv.com';
module.exports = async (ctx) => {
- const language = ctx.params.language;
- const id = ctx.params.id;
+ const language = ctx.req.param('language');
+ const id = ctx.req.param('id');
const url = `${host}/${language}/${id}`;
const response = await got(url);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const title = $('h1.block_title').text();
const list = $('div.list_wrapper > div')
.map((_, item) => ({
@@ -26,7 +26,7 @@ module.exports = async (ctx) => {
list.map((item) =>
ctx.cache.tryGet(item.link, async () => {
const detailResponse = await got.get(item.link);
- const content = cheerio.load(detailResponse.data);
+ const content = load(detailResponse.data);
item.description = content('div.post_content').html();
item.pubDate = timezone(parseDate(content('div.time > span').text()), +8);
@@ -36,9 +36,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: `新唐人电视台 - ${title}`,
link: url,
item: items,
- };
+ });
};
diff --git a/lib/v2/nua/dc.js b/lib/v2/nua/dc.js
index aad493f158..e9021880d2 100644
--- a/lib/v2/nua/dc.js
+++ b/lib/v2/nua/dc.js
@@ -1,7 +1,7 @@
const util = require('./utils');
module.exports = async (ctx) => {
- const type = ctx.params.type;
+ const type = ctx.req.param('type');
const baseUrl = 'https://dc.nua.edu.cn';
@@ -54,10 +54,10 @@ module.exports = async (ctx) => {
const items = await util.ProcessList(baseUrl, baseUrl, listName, listDate, webPageName);
const results = await util.ProcessFeed(items[0], artiContent, ctx);
- ctx.state.data = {
+ ctx.set('data', {
title: 'NUA-设计学院-' + items[1],
link: baseUrl,
description: '南京艺术学院 设计学院 ' + items[1],
item: results,
- };
+ });
};
diff --git a/lib/v2/nua/gra.js b/lib/v2/nua/gra.js
index 9d9daed64b..a5a5dc0096 100644
--- a/lib/v2/nua/gra.js
+++ b/lib/v2/nua/gra.js
@@ -2,7 +2,7 @@ const util = require('./utils');
const baseUrl = 'https://grad.nua.edu.cn';
module.exports = async (ctx) => {
- const type = ctx.params.type;
+ const type = ctx.req.param('type');
const newsUrl = `${baseUrl}/${type}/list.htm`;
const listName = 'li.list_item';
const artiContent = '.read';
@@ -12,10 +12,10 @@ module.exports = async (ctx) => {
const items = await util.ProcessList(newsUrl, baseUrl, listName, listDate, webPageName);
const results = await util.ProcessFeed(items[0], artiContent, ctx);
- ctx.state.data = {
+ ctx.set('data', {
title: 'NUA-研究生处-' + items[1],
link: `${baseUrl}/${type}/list.htm`,
description: '南京艺术学院 研究生处 ' + items[1],
item: results,
- };
+ });
};
diff --git a/lib/v2/nua/index.js b/lib/v2/nua/index.js
index 57ae600b62..868ab837b6 100644
--- a/lib/v2/nua/index.js
+++ b/lib/v2/nua/index.js
@@ -1,7 +1,7 @@
const util = require('./utils');
module.exports = async (ctx) => {
- const type = ctx.params.type;
+ const type = ctx.req.param('type');
const baseUrl = 'https://www.nua.edu.cn';
const newsUrl = `${baseUrl}/${type}/list.htm`;
@@ -13,10 +13,10 @@ module.exports = async (ctx) => {
const items = await util.ProcessList(newsUrl, baseUrl, listName, listDate, webPageName);
const results = await util.ProcessFeed(items[0], artiContent, ctx);
- ctx.state.data = {
+ ctx.set('data', {
title: 'NUA-' + items[1],
link: newsUrl,
description: '南京艺术学院 ' + items[1],
item: results,
- };
+ });
};
diff --git a/lib/v2/nua/lib.js b/lib/v2/nua/lib.js
index 0046b373e7..2a08f89d9e 100644
--- a/lib/v2/nua/lib.js
+++ b/lib/v2/nua/lib.js
@@ -2,7 +2,7 @@ const util = require('./utils');
const baseUrl = 'https://lib.nua.edu.cn';
module.exports = async (ctx) => {
- const type = ctx.params.type;
+ const type = ctx.req.param('type');
let webPageName;
switch (type) {
@@ -30,10 +30,10 @@ module.exports = async (ctx) => {
const items = await util.ProcessList(newsUrl, baseUrl, listName, listDate, webPageName);
const results = await util.ProcessFeed(items[0], artiContent, ctx);
- ctx.state.data = {
+ ctx.set('data', {
title: 'NUA-图书馆-' + items[1],
link: `${baseUrl}/${type}/list.htm`,
description: '南京艺术学院 图书馆 ' + items[1],
item: results,
- };
+ });
};
diff --git a/lib/v2/nua/sxw.js b/lib/v2/nua/sxw.js
index 750912afbd..e5662eb9dc 100644
--- a/lib/v2/nua/sxw.js
+++ b/lib/v2/nua/sxw.js
@@ -1,7 +1,7 @@
const util = require('./utils');
module.exports = async (ctx) => {
- const type = ctx.params.type;
+ const type = ctx.req.param('type');
const baseUrl = 'https://sxw.nua.edu.cn';
const newsUrl = `${baseUrl}/${type}/list.htm`;
@@ -13,10 +13,10 @@ module.exports = async (ctx) => {
const items = await util.ProcessList(newsUrl, baseUrl, listName, listDate, webPageName);
const results = await util.ProcessFeed(items[0], artiContent, ctx);
- ctx.state.data = {
+ ctx.set('data', {
title: 'NUA-双馨网-' + items[1],
link: newsUrl,
description: '南京艺术学院 双馨网 ' + items[1],
item: results,
- };
+ });
};
diff --git a/lib/v2/nua/utils.js b/lib/v2/nua/utils.js
index 543acf04f7..79f39d8d2b 100644
--- a/lib/v2/nua/utils.js
+++ b/lib/v2/nua/utils.js
@@ -1,7 +1,7 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
-const timezone = require('@/utils/timezone');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import timezone from '@/utils/timezone';
const { fetchArticle } = require('@/utils/wechat-mp');
const pageType = (href) => {
@@ -24,7 +24,7 @@ function arti_link(text, href) {
async function ProcessList(newsUrl, baseUrl, listName, listDate, webPageName) {
const result = await got(newsUrl, { https: { rejectUnauthorized: false } });
- const $ = cheerio.load(result.data);
+ const $ = load(result.data);
const pageName = $(webPageName).text().trim();
@@ -53,7 +53,7 @@ const ProcessFeed = (items, artiContent, ctx) =>
case 'in-nua':
case 'nua': {
const result = await got(item.link, { https: { rejectUnauthorized: false } });
- const $ = cheerio.load(result.data);
+ const $ = load(result.data);
item.author = $('.arti_publisher').text() + ' ' + $('.arti_views').text();
item.description = $(artiContent).html();
return item;
diff --git a/lib/v2/nuaa/college/cae.js b/lib/v2/nuaa/college/cae.js
index bf262d4741..3af4e2efaf 100644
--- a/lib/v2/nuaa/college/cae.js
+++ b/lib/v2/nuaa/college/cae.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
const getCookie = require('../utils/pypasswaf');
const host = 'https://cae.nuaa.edu.cn/';
@@ -17,9 +17,9 @@ const map = new Map([
]);
module.exports = async (ctx) => {
- const type = ctx.params.type;
+ const type = ctx.req.param('type');
const suffix = map.get(type).suffix;
- const getDescription = Boolean(ctx.params.getDescription) || false;
+ const getDescription = Boolean(ctx.req.param('getDescription')) || false;
const link = new URL(suffix, host).href;
const cookie = await getCookie(host);
const gotConfig = {
@@ -28,7 +28,7 @@ module.exports = async (ctx) => {
},
};
const response = await got(link, gotConfig);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('#wp_news_w6 ul li')
.slice(0, 10)
@@ -55,7 +55,7 @@ module.exports = async (ctx) => {
const pageType = arr.at(-1);
if (pageType === 'htm' || pageType === 'html') {
const response = await got(itemUrl, gotConfig);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
return $('.wp_articlecontent').html() + '
查看原文'; } }); @@ -70,10 +70,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: map.get(type).title, link, description: '南京航空航天大学自动化学院RSS', item: out, - }; + }); }; diff --git a/lib/v2/nuaa/college/cs.js b/lib/v2/nuaa/college/cs.js index d792bcdc62..a84c9f001a 100644 --- a/lib/v2/nuaa/college/cs.js +++ b/lib/v2/nuaa/college/cs.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const getCookie = require('../utils/pypasswaf'); const host = 'https://cs.nuaa.edu.cn/'; @@ -15,8 +15,8 @@ const map = new Map([ ]); module.exports = async (ctx) => { - const type = ctx.params.type; - const getDescription = Boolean(ctx.params.getDescription) || false; + const type = ctx.req.param('type'); + const getDescription = Boolean(ctx.req.param('getDescription')) || false; const suffix = map.get(type).suffix; const link = new URL(suffix, host).href; @@ -27,7 +27,7 @@ module.exports = async (ctx) => { }, }; const response = await got(link, gotConfig); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('#news_list ul li') .slice(0, Math.min(Number.parseInt($('.per_count', '#wp_paging_w6').text()), Number.parseInt($('.all_count', '#wp_paging_w6').slice(1).text()))) @@ -54,7 +54,7 @@ module.exports = async (ctx) => { const pageType = arr.at(-1); if (pageType === 'htm' || pageType === 'html') { const response = await got(itemUrl, gotConfig); - const $ = cheerio.load(response.data); + const $ = load(response.data); return $('.wp_articlecontent').html() + '
查看原文'; } }); @@ -69,10 +69,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: map.get(type).title, link, description: '南京航空航天大学计算机科学与技术学院RSS', item: out, - }; + }); }; diff --git a/lib/v2/nuaa/jwc/jwc.js b/lib/v2/nuaa/jwc/jwc.js index 96e5b85ba5..7f58a076b9 100644 --- a/lib/v2/nuaa/jwc/jwc.js +++ b/lib/v2/nuaa/jwc/jwc.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const getCookie = require('../utils/pypasswaf'); const host = 'http://aao.nuaa.edu.cn/'; @@ -13,9 +13,9 @@ const map = new Map([ ]); module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); const suffix = map.get(type).suffix; - const getDescription = Boolean(ctx.params.getDescription) || false; + const getDescription = Boolean(ctx.req.param('getDescription')) || false; const link = new URL(suffix, host).href; const cookie = await getCookie(host); @@ -25,7 +25,7 @@ module.exports = async (ctx) => { }, }; const response = await got(link, gotConfig); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('#wp_news_w8 ul li') .slice(0, 10) @@ -52,7 +52,7 @@ module.exports = async (ctx) => { const pageType = arr.at(-1); if (pageType === 'htm' || pageType === 'html') { const response = await got(itemUrl, gotConfig); - const $ = cheerio.load(response.data); + const $ = load(response.data); return $('.wp_articlecontent').html() + '
查看原文'; } }); @@ -67,10 +67,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: map.get(type).title, link, description: '南京航空航天大学教务处RSS', item: out, - }; + }); }; diff --git a/lib/v2/nuaa/utils/pypasswaf.js b/lib/v2/nuaa/utils/pypasswaf.js index c17cc443f9..d8840dde5a 100644 --- a/lib/v2/nuaa/utils/pypasswaf.js +++ b/lib/v2/nuaa/utils/pypasswaf.js @@ -1,11 +1,12 @@ const puppeteerUtils = require('@/utils/puppeteer-utils'); +import puppeteer from '@/utils/puppeteer'; /** * async function 获取cookie * @desc 返回一个可用的cookie，使用 `got` 发起请求的时候，传入到`options.headers.cookie`即可 */ module.exports = async function getCookie(host) { - const browser = await require('@/utils/puppeteer')({ stealth: true }); + const browser = puppeteer({ stealth: true }); const page = await browser.newPage(); await page.setRequestInterception(true); page.on('request', (request) => { diff --git a/lib/v2/nuaa/yjsy/yjsy.js b/lib/v2/nuaa/yjsy/yjsy.js index 4b004706f0..0532c8509a 100644 --- a/lib/v2/nuaa/yjsy/yjsy.js +++ b/lib/v2/nuaa/yjsy/yjsy.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const getCookie = require('../utils/pypasswaf'); const host = 'http://www.graduate.nuaa.edu.cn/'; @@ -12,9 +12,9 @@ const map = new Map([ ]); module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); const suffix = map.get(type).suffix; - const getDescription = Boolean(ctx.params.getDescription) || false; + const getDescription = Boolean(ctx.req.param('getDescription')) || false; const link = new URL(suffix, host).href; const cookie = await getCookie(host); const gotConfig = { @@ -23,7 +23,7 @@ module.exports = async (ctx) => { }, }; const response = await got(link, gotConfig); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('#wp_news_w6 ul li') .slice(0, 10) @@ -50,7 +50,7 @@ module.exports = async (ctx) => { const pageType = arr.at(-1); if (pageType === 'htm' || pageType === 'html') { const response = await got(itemUrl, gotConfig); - const $ = cheerio.load(response.data); + const $ = load(response.data); return $('.wp_articlecontent').html() + '
查看原文'; } }); @@ -65,10 +65,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: map.get(type).title, link, description: '南京航空航天大学研究生院RSS', item: out, - }; + }); }; diff --git a/lib/v2/nuist/bulletin.js b/lib/v2/nuist/bulletin.js index db6a45d7a0..8f10769e00 100644 --- a/lib/v2/nuist/bulletin.js +++ b/lib/v2/nuist/bulletin.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseTitle = '南信大信息公告栏'; const baseUrl = 'https://bulletin.nuist.edu.cn'; @@ -22,14 +22,14 @@ const map = { }; module.exports = async (ctx) => { - const category = Object.hasOwn(map, ctx.params.category) ? ctx.params.category : '791'; + const category = Object.hasOwn(map, ctx.req.param('category')) ? ctx.req.param('category') : '791'; const link = `${baseUrl}/${category}/list.htm`; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.news_list').find('.news'); - ctx.state.data = { + ctx.set('data', { title: baseTitle + (category === '791' ? '' : ':' + map[category]), link, item: list @@ -57,5 +57,5 @@ module.exports = async (ctx) => { }; }) .get(), - }; + }); }; diff --git a/lib/v2/nuist/cas.js b/lib/v2/nuist/cas.js index 2aa26733a9..09e9062225 100644 --- a/lib/v2/nuist/cas.js +++ b/lib/v2/nuist/cas.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const baseTitle = 'NUIST AS（南信大大气科学学院）'; const baseUrl = 'https://cas.nuist.edu.cn'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { const link = `${baseUrl}/index/${category}.htm`; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('#ctl00_ctl00_body_NewsList') .find('tr.gridline') .toArray() @@ -37,7 +37,7 @@ module.exports = async (ctx) => { let response; try { response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const authorMatch = $('.zzxx') .text() @@ -62,10 +62,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: baseTitle + '：' + $('.dqlm').find('a').eq(1).text(), description: $('meta[name=description]').attr('content'), link, item: items, - }; + }); }; diff --git a/lib/v2/nuist/jwc.js b/lib/v2/nuist/jwc.js index 4d939c4649..f4f2e5ab1d 100644 --- a/lib/v2/nuist/jwc.js +++ b/lib/v2/nuist/jwc.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseTitle = '南京信息工程大学-教务处'; const baseUrl = 'https://jwc.nuist.edu.cn'; @@ -10,7 +10,7 @@ module.exports = async (ctx) => { const link = `${baseUrl}/${category === 'jxyw' || category === 'xyjx' ? 'index' : 'xxtz'}/${category}.htm`; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.main_list ul li') .toArray() .map((item) => { @@ -26,7 +26,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.description = $('#vsb_content').html(); @@ -35,9 +35,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: baseTitle + '：' + $('.dqwz').find('a').eq(1).text(), link, item: items, - }; + }); }; diff --git a/lib/v2/nuist/library/lib.js b/lib/v2/nuist/library/lib.js index c3a29bcbe7..c475757dfa 100644 --- a/lib/v2/nuist/library/lib.js +++ b/lib/v2/nuist/library/lib.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseTitle = '南京信息工程大学图书馆通知'; const baseUrl = 'https://lib.nuist.edu.cn'; @@ -8,7 +8,7 @@ module.exports = async (ctx) => { const link = baseUrl + '/index/tzgg.htm'; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.list2 li') .toArray() .map((item) => { @@ -25,7 +25,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.description = $('#vsb_content').html(); item.pubDate = parseDate($('.date').find('span').eq(0).text(), 'YYYY年MM月DD日'); @@ -35,9 +35,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: baseTitle, link, item: items, - }; + }); }; diff --git a/lib/v2/nuist/scs.js b/lib/v2/nuist/scs.js index afa6cdd80d..eef4078d9d 100644 --- a/lib/v2/nuist/scs.js +++ b/lib/v2/nuist/scs.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseTitle = 'NUIST CS（南信大计软院）'; const baseUrl = 'https://scs.nuist.edu.cn'; @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const link = `${baseUrl}/${category}/list.htm`; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.newsList ul') .eq(0) @@ -28,7 +28,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const authorMatch = $('.newsTitleAddDate') .text() @@ -40,10 +40,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: baseTitle + '：' + $('head title').text(), description: $('meta[name=description]').attr('content'), link, item: items, - }; + }); }; diff --git a/lib/v2/nuist/sese.js b/lib/v2/nuist/sese.js index fd31d29c11..4c6a7d3075 100644 --- a/lib/v2/nuist/sese.js +++ b/lib/v2/nuist/sese.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseTitle = 'NUIST ESE（南信大环科院）'; const baseUrl = 'https://sese.nuist.edu.cn'; @@ -10,7 +10,7 @@ module.exports = async (ctx) => { const link = `${baseUrl}/${category}.htm`; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('#ctl00_ctl00_mainbody_rightbody_listcontent_NewsList .gridline') .toArray() .map((item) => { @@ -27,7 +27,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.description = $('#vsb_content_6').html(); @@ -36,10 +36,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: baseTitle + '：' + $('.lmtitle').text(), description: $('meta[name=description]').attr('content'), link, item: items, - }; + }); }; diff --git a/lib/v2/nuist/xgc.js b/lib/v2/nuist/xgc.js index 090a2981e6..700c741f62 100644 --- a/lib/v2/nuist/xgc.js +++ b/lib/v2/nuist/xgc.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseTitle = '南信大学生工作处'; const baseUrl = 'https://xgc.nuist.edu.cn'; @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const link = baseUrl + '/419/list.htm'; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.wp_article_list .list_item') .toArray() .map((item) => { @@ -27,7 +27,7 @@ module.exports = async (ctx) => { let response; try { response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const articleInfo = $('.arti_metas'); @@ -41,9 +41,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: baseTitle, link, item: items.filter(Boolean), - }; + }); }; diff --git a/lib/v2/nuist/yjs.js b/lib/v2/nuist/yjs.js index 3fe190f154..75821dc7a7 100644 --- a/lib/v2/nuist/yjs.js +++ b/lib/v2/nuist/yjs.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const path = ctx.path === '/yjs/' ? 'index/tzgg' : ctx.path.replace(/^\/yjs\//, ''); @@ -14,7 +14,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.gridlinediv') .toArray() @@ -38,7 +38,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); const timeMatches = content('.bar') .text() @@ -52,9 +52,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/nwafu/all.js b/lib/v2/nwafu/all.js index e70f74c679..0882e0887f 100644 --- a/lib/v2/nwafu/all.js +++ b/lib/v2/nwafu/all.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { nwafuMap } = require('./utils'); module.exports = async (ctx) => { const { type = 'jiaowu' } = ctx.params; const response = await got.get(nwafuMap.get(type)[0]); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $(nwafuMap.get(type)[1]) .map((index, ele) => { const itemTitle = $(ele).find(nwafuMap.get(type)[2]).text(); @@ -27,17 +27,17 @@ module.exports = async (ctx) => { return item; } const detailResponse = await got.get(item.link); - const $ = cheerio.load(detailResponse.data); + const $ = load(detailResponse.data); item.description = $(nwafuMap.get(type)[3]).html(); return item; }) ) ); - ctx.state.data = { + ctx.set('data', { title: nwafuMap.get(type)[4], link: nwafuMap.get(type)[0], description: nwafuMap.get(type)[4], item: out, - }; + }); }; diff --git a/lib/v2/nyaa/main.js b/lib/v2/nyaa/main.js index 97496bc3bc..3e83ebdd6f 100644 --- a/lib/v2/nyaa/main.js +++ b/lib/v2/nyaa/main.js @@ -1,4 +1,4 @@ -const config = require('@/config').value; +import { config } from '@/config'; const Parser = require('rss-parser'); module.exports = async (ctx) => { @@ -36,10 +36,10 @@ module.exports = async (ctx) => { return item; }); - ctx.state.data = { + ctx.set('data', { title: feed.title, link: currentLink, description: feed.description, item: feed.items, - }; + }); }; diff --git a/lib/v2/nytimes/book.js b/lib/v2/nytimes/book.js index 11be6b84bf..8c547e5b39 100644 --- a/lib/v2/nytimes/book.js +++ b/lib/v2/nytimes/book.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const categoryList = { 'combined-print-and-e-book-nonfiction': '非虚构类 - 综合', @@ -16,7 +16,7 @@ const categoryList = { }; module.exports = async (ctx) => { - const category = ctx.params.category ?? 'combined-print-and-e-book-nonfiction'; + const category = ctx.req.param('category') ?? 'combined-print-and-e-book-nonfiction'; const url = `https://www.nytimes.com/books/best-sellers/${category}`; @@ -28,7 +28,7 @@ module.exports = async (ctx) => { url, }); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); dataTitle = $('h1').eq(0).text(); items = $('article[itemprop=itemListElement]') @@ -63,9 +63,9 @@ module.exports = async (ctx) => { .get(); } - ctx.state.data = { + ctx.set('data', { title: `The New York Times Best Sellers - ${dataTitle}`, link: url, item: items, - }; + }); }; diff --git a/lib/v2/nytimes/daily-briefing-chinese.js b/lib/v2/nytimes/daily-briefing-chinese.js index 1aad4fc234..64b888735b 100644 --- a/lib/v2/nytimes/daily-briefing-chinese.js +++ b/lib/v2/nytimes/daily-briefing-chinese.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -34,7 +34,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); // to remove ads content('.StoryBodyCompanionColumn').last().find('p').last().remove(); @@ -59,9 +59,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '新闻简报 - The New York Times', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/nytimes/index.js b/lib/v2/nytimes/index.js index 7f12af1bbc..2002d22968 100644 --- a/lib/v2/nytimes/index.js +++ b/lib/v2/nytimes/index.js @@ -1,7 +1,8 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const parser = require('@/utils/rss-parser'); const utils = require('./utils'); -const cheerio = require('cheerio'); +import { load } from 'cheerio'; +import puppeteer from '@/utils/puppeteer'; module.exports = async (ctx) => { let { lang = '' } = ctx.params; @@ -38,7 +39,7 @@ module.exports = async (ctx) => { // Do nothing } - const browser = await require('@/utils/puppeteer')(); + const browser = puppeteer(); const feed = await parser.parseURL(rssUrl); const items = await Promise.all( feed.items.splice(0, 10).map(async (item) => { @@ -74,7 +75,7 @@ module.exports = async (ctx) => { }); if (lang === 'en') { - const $ = cheerio.load(response); + const $ = load(response); if ($('.dual-btn').length > 0) { hasEnVersion = true; link = $('.dual-btn a').last().attr().href; @@ -113,10 +114,10 @@ module.exports = async (ctx) => { browser.close(); - ctx.state.data = { + ctx.set('data', { title, link: 'https://cn.nytimes.com', description: title, item: items, - }; + }); }; diff --git a/lib/v2/nytimes/utils.js b/lib/v2/nytimes/utils.js index ccaf42ed5e..df77369ce0 100644 --- a/lib/v2/nytimes/utils.js +++ b/lib/v2/nytimes/utils.js @@ -1,5 +1,5 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const ProcessImage = ($, e) => { const photo = $(e).find('figure').find('picture').find('img'); @@ -30,7 +30,7 @@ const PuppeterGetter = async (ctx, browser, link) => { }; const ProcessFeed = (data, hasEnVersion = false) => { - const $ = cheerio.load(data); + const $ = load(data); let content; const result = {}; diff --git a/lib/v2/oceanengine/arithmetic-index.js b/lib/v2/oceanengine/arithmetic-index.js index 4ca6d121df..9d22b86fb0 100644 --- a/lib/v2/oceanengine/arithmetic-index.js +++ b/lib/v2/oceanengine/arithmetic-index.js @@ -1,9 +1,10 @@ const dayjs = require('dayjs'); -const { art } = require('@/utils/render'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { art } from '@/utils/render'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const path = require('path'); -const config = require('@/config').value; +import { config } from '@/config'; +import puppeteer from '@/utils/puppeteer'; // Parameters const CACHE_MAX_AGE = config.cache.contentExpire; @@ -80,23 +81,23 @@ module.exports = async (ctx) => { const now = dayjs(); const start_date = now.subtract(DEFAULT_FETCH_DURATION_MONTH, 'month').format('YYYYMMDD'); const end_date = now.format('YYYYMMDD'); - const keyword = ctx.params.keyword; + const keyword = ctx.req.param('keyword'); if (!keyword) { throw new Error('Invalid keyword'); } - if (ctx.params.channel && !['douyin', 'toutiao'].includes(ctx.params.channel)) { + if (ctx.req.param('channel') && !['douyin', 'toutiao'].includes(ctx.req.param('channel'))) { throw new Error('Invalid channel。 Only support `douyin` or `toutiao`'); } - const channel = ctx.params.channel === 'toutiao' ? 'toutiao' : 'aweme'; // default channel is `douyin` - const channelName = ctx.params.channel === 'toutiao' ? '头条' : '抖音'; + const channel = ctx.req.param('channel') === 'toutiao' ? 'toutiao' : 'aweme'; // default channel is `douyin` + const channelName = ctx.req.param('channel') === 'toutiao' ? '头条' : '抖音'; const link = `https://trendinsight.oceanengine.com/arithmetic-index/analysis?keyword=${keyword}&appName=${channel}`; const item = await ctx.cache.tryGet( link, async () => { - const browser = await require('@/utils/puppeteer')(); + const browser = puppeteer(); const page = await browser.newPage(); await page.setRequestInterception(true); page.on('request', (request) => { @@ -135,11 +136,11 @@ module.exports = async (ctx) => { false ); - ctx.state.data = { + ctx.set('data', { title: `${keyword} - ${channelName}指数波峰`, link, description: `巨量算数 - ${channelName}算数指数 | 关键词: ${keyword}`, language: 'zh-cn', item, - }; + }); }; diff --git a/lib/v2/odaily/activity.js b/lib/v2/odaily/activity.js index 96b74e4f8e..18577d3347 100644 --- a/lib/v2/odaily/activity.js +++ b/lib/v2/odaily/activity.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const { rootUrl } = require('./utils'); module.exports = async (ctx) => { - const currentUrl = `${rootUrl}/service/scheme/group/8?page=1&per_page=${ctx.query.limit ?? 25}`; + const currentUrl = `${rootUrl}/service/scheme/group/8?page=1&per_page=${ctx.req.query('limit') ?? 25}`; const response = await got({ method: 'get', @@ -26,7 +26,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data.match(/"content":"(.*)"}},"secondaryList":/)[1]); + const content = load(detailResponse.data.match(/"content":"(.*)"}},"secondaryList":/)[1]); content('img').each(function () { content(this).attr('src', content(this).attr('src').replaceAll('\\"', '')); @@ -39,9 +39,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '活动 - Odaily星球日报', link: `${rootUrl}/activityPage`, item: items, - }; + }); }; diff --git a/lib/v2/odaily/newsflash.js b/lib/v2/odaily/newsflash.js index 302f909db5..9187a20a8e 100644 --- a/lib/v2/odaily/newsflash.js +++ b/lib/v2/odaily/newsflash.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const { rootUrl } = require('./utils'); module.exports = async (ctx) => { - const currentUrl = `${rootUrl}/api/pp/api/info-flow/newsflash_columns/newsflashes?b_id=&per_page=${ctx.query.limit ?? 100}`; + const currentUrl = `${rootUrl}/api/pp/api/info-flow/newsflash_columns/newsflashes?b_id=&per_page=${ctx.req.query('limit') ?? 100}`; const response = await got({ method: 'get', @@ -18,9 +18,9 @@ module.exports = async (ctx) => { description: `
Firmware OpenWrt Upgrade: ${$('.firmware_openwrt_upgrade_url').html()}'`, }, ], - }; + }); }; diff --git a/lib/v2/orcid/index.js b/lib/v2/orcid/index.js index c412b738a5..1655f78825 100644 --- a/lib/v2/orcid/index.js +++ b/lib/v2/orcid/index.js @@ -1,16 +1,16 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const rootUrl = 'https://orcid.org/'; const currentUrl = `${rootUrl}${id}/worksPage.json?offset=0&sort=date&sortAsc=false&pageSize=20`; const response = await got(currentUrl); const items = response.data.groups; - const works = new Array(); - const out = new Array(); + const works = []; + const out = []; for (const item of items) { for (let j = 0; j < item.works.length; j++) { @@ -44,9 +44,9 @@ module.exports = async (ctx) => { return info; }); - ctx.state.data = { + ctx.set('data', { title: 'ORCID Works List' + id, link: currentUrl, item: out, - }; + }); }; diff --git a/lib/v2/oreno3d/get-sec-page-data.js b/lib/v2/oreno3d/get-sec-page-data.js index 429f99aaf6..a8e2533ba2 100644 --- a/lib/v2/oreno3d/get-sec-page-data.js +++ b/lib/v2/oreno3d/get-sec-page-data.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const rootUrl = 'https://oreno3d.com'; @@ -17,7 +17,7 @@ async function sync_detail(link) { const iwara_link_selector = 'header > figure.video-figure > a'; // 下载 const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); // 创建列表 const tags = []; const authors = []; diff --git a/lib/v2/oreno3d/main.js b/lib/v2/oreno3d/main.js index 318dc7bf79..082caaac52 100644 --- a/lib/v2/oreno3d/main.js +++ b/lib/v2/oreno3d/main.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); -const cheerio = require('cheerio'); +import { load } from 'cheerio'; const get_sec_page_data = require('./get-sec-page-data'); const rootUrl = 'https://oreno3d.com'; @@ -16,20 +16,20 @@ const sortRename = { function get_user_url(rootUrl, ctx, sort) { let userUrl = ''; // 判断userurl获取位置 - if (ctx.params.keyword) { - const keyword = ctx.params.keyword; + if (ctx.req.param('keyword')) { + const keyword = ctx.req.param('keyword'); userUrl = `${rootUrl}/search?sort=${sort}&keyword=${keyword}`; - } else if (ctx.params.characterid) { - const characterid = ctx.params.characterid; + } else if (ctx.req.param('characterid')) { + const characterid = ctx.req.param('characterid'); userUrl = `${rootUrl}/characters/${characterid}?sort=${sort}`; - } else if (ctx.params.authorid) { - const authorid = ctx.params.authorid; + } else if (ctx.req.param('authorid')) { + const authorid = ctx.req.param('authorid'); userUrl = `${rootUrl}/authors/${authorid}?sort=${sort}`; - } else if (ctx.params.tagid) { - const tagid = ctx.params.tagid; + } else if (ctx.req.param('tagid')) { + const tagid = ctx.req.param('tagid'); userUrl = `${rootUrl}/tags/${tagid}?sort=${sort}`; - } else if (ctx.params.originid) { - const originid = ctx.params.originid; + } else if (ctx.req.param('originid')) { + const originid = ctx.req.param('originid'); userUrl = `${rootUrl}/origins/${originid}?sort=${sort}`; } return userUrl; @@ -38,14 +38,14 @@ module.exports = async (ctx) => { // 获取视频链接列表及标题 function getLinksTitle(response) { const selector = 'a.box'; - const $ = cheerio.load(response.data); + const $ = load(response.data); const title = $('div.g-main-list').find('h1.main-h').text(); const list = $(selector); return { title, list }; } // 数据爬取和分析 async function getData(response) { - const $ = cheerio.load(response.data); + const $ = load(response.data); // 第一页，获取搜索主标题 const title = getLinksTitle(response).title; const list = getLinksTitle(response).list; @@ -96,13 +96,13 @@ module.exports = async (ctx) => { return { items, title }; } // 参数定义 - const sort = ctx.params.sort; - let pagelimit = ctx.params.pagelimit ?? 1; + const sort = ctx.req.param('sort'); + let pagelimit = ctx.req.param('pagelimit') ?? 1; // 根链接 const userUrl = get_user_url(rootUrl, ctx, sort); // 确认最大页数并比较修改(同时也是获取第一页的内容) const response = await got(userUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const maxPageSelector = 'div.container > main > div.g-main-list > ul.pagination > li:last-child > a'; // 页码判断 if ($(maxPageSelector)) { @@ -149,9 +149,9 @@ module.exports = async (ctx) => { item: realItem, }; // 生成RSS源码 - ctx.state.data = { + ctx.set('data', { title: `${data.title} - ${sortRename[sort]}(Page 1-${pagelimit})`, link: userUrl, item: data.item, - }; + }); }; diff --git a/lib/v2/oschina/news.js b/lib/v2/oschina/news.js index 6682bb44cb..686884b1a4 100644 --- a/lib/v2/oschina/news.js +++ b/lib/v2/oschina/news.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { parseDate, parseRelativeDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); -const cheerio = require('cheerio'); +import timezone from '@/utils/timezone'; +import { load } from 'cheerio'; const configs = { all: { @@ -32,7 +32,7 @@ const configs = { }; module.exports = async (ctx) => { - const category = ctx.params.category ?? 'all'; + const category = ctx.req.param('category') ?? 'all'; const config = configs[category]; const res = await got(config.ajaxUrl, { @@ -41,7 +41,7 @@ module.exports = async (ctx) => { 'X-Requested-With': 'XMLHttpRequest', }, }); - const $ = cheerio.load(res.data); + const $ = load(res.data); const list = $('.items .news-item') .toArray() @@ -65,7 +65,7 @@ module.exports = async (ctx) => { Referer: config.link, }, }); - const content = cheerio.load(detail.data); + const content = load(detail.data); content('.ad-wrap').remove(); item.description = content('.article-detail').html(); @@ -77,7 +77,7 @@ module.exports = async (ctx) => { Referer: config.link, }, }); - const content = cheerio.load(detail.data); + const content = load(detail.data); item.description = content('.file_content').html(); } @@ -86,9 +86,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `开源中国-${config.name}`, link: config.link, item: resultItem, - }; + }); }; diff --git a/lib/v2/oschina/topic.js b/lib/v2/oschina/topic.js index f2e70e80f1..5a671e32a6 100644 --- a/lib/v2/oschina/topic.js +++ b/lib/v2/oschina/topic.js @@ -1,19 +1,19 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { parseDate, parseRelativeDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); -const cheerio = require('cheerio'); +import timezone from '@/utils/timezone'; +import { load } from 'cheerio'; -async function load(link) { +async function loadContent(link) { const res = await got(link); - const content = cheerio.load(res.data); + const content = load(res.data); return content; } module.exports = async (ctx) => { - const topic = ctx.params.topic; + const topic = ctx.req.param('topic'); const topicUrl = `https://www.oschina.net/question/topic/${topic}?show=time`; - const $ = await load(topicUrl); + const $ = await loadContent(topicUrl); const topicName = $('.topic-info > .topic-header > h3').text(); const list = $('#questionList .question-item') .toArray() @@ -33,7 +33,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { try { - const content = await load(item.link); + const content = await loadContent(item.link); content('.ad-wrap').remove(); item.description = content('#articleContent').html(); } catch { @@ -44,10 +44,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `开源中国-${topicName}`, description: $('.topic-introduction').text(), link: topicUrl, item: resultItem, - }; + }); }; diff --git a/lib/v2/oschina/user.js b/lib/v2/oschina/user.js index 65ffd0c3dc..8c3015ef93 100644 --- a/lib/v2/oschina/user.js +++ b/lib/v2/oschina/user.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { parseDate, parseRelativeDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const { id, uid } = ctx.params; const res = id ? await got(`https://my.oschina.net/${id}`) : await got(`https://my.oschina.net/u/${uid}`); - const $ = cheerio.load(res.data); + const $ = load(res.data); const author = $('.user-name .name').text(); const list = $('#newestBlogList .blog-item') @@ -31,7 +31,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(item.link, async () => { if (item.accessible) { const detail = await got(item.link); - const content = cheerio.load(detail.data); + const content = load(detail.data); item.description = content('.article-detail').html(); } @@ -41,10 +41,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: author + '的博客', description: $('.user-text .user-signature').text(), link: `https://my.oschina.net/${id ?? uid}`, item: resultItem, - }; + }); }; diff --git a/lib/v2/oshwhub/explore.js b/lib/v2/oshwhub/explore.js index f24cd63e68..03a00b36fa 100644 --- a/lib/v2/oshwhub/explore.js +++ b/lib/v2/oshwhub/explore.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const path = require('path'); -const { art } = require('@/utils/render'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import { art } from '@/utils/render'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const md = require('markdown-it')({ html: true, linkify: true, @@ -49,7 +49,7 @@ const requestImages = (url, tryGet) => module.exports = async (ctx) => { const baseUrl = 'https://oshwhub.com'; - const sortType = ctx.params.sortType ?? 'updatedTime'; + const sortType = ctx.req.param('sortType') ?? 'updatedTime'; const url = `${baseUrl}/explore?projectSort=${sortType}`; const response = await got({ @@ -58,7 +58,7 @@ module.exports = async (ctx) => { }); const html = response.data; - const $ = cheerio.load(html); + const $ = load(html); const title = $('title').text(); const projects = $('a[class="project-link"]'); @@ -72,7 +72,7 @@ module.exports = async (ctx) => { }); const html = response.data; - const $$ = cheerio.load(html); + const $$ = load(html); const projectDetail = $$('div[class="projects-left-top"]'); const title = $$(projectDetail).find('span[class="title"]').text(); @@ -112,10 +112,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title, link: url, description: title, item: items, - }; + }); }; diff --git a/lib/v2/osu/beatmaps/packs.js b/lib/v2/osu/beatmaps/packs.js index c0b9f9b4fa..03d9819ae2 100644 --- a/lib/v2/osu/beatmaps/packs.js +++ b/lib/v2/osu/beatmaps/packs.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const { type = 'standard' } = ctx.params; @@ -8,10 +8,10 @@ module.exports = async (ctx) => { const link = `https://osu.ppy.sh/beatmaps/packs?type=${type}`; const response = await got.get(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const itemList = $('.beatmap-pack'); - ctx.state.data = { + ctx.set('data', { title: `osu! Beatmap Pack - ${type}`, link, item: itemList.toArray().map((element) => { @@ -31,5 +31,5 @@ module.exports = async (ctx) => { author, }; }), - }; + }); }; diff --git a/lib/v2/otobanana/cast.js b/lib/v2/otobanana/cast.js index 3d92fb2718..50002da5cc 100644 --- a/lib/v2/otobanana/cast.js +++ b/lib/v2/otobanana/cast.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { apiBase, baseUrl, getUserInfo, renderCast } = require('./utils'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const casts = castData.results.map((item) => renderCast(item)); - ctx.state.data = { + ctx.set('data', { title: `${userInfo.name} (@${userInfo.username}) - 音声投稿 | OTOBANANA`, description: userInfo.bio.replaceAll('\n', ' '), link: `${baseUrl}/user/${id}`, @@ -20,10 +20,10 @@ module.exports = async (ctx) => { author: userInfo.name, itunes_author: userInfo.name, item: casts, - }; + }); - ctx.state.json = { + ctx.set('json', { userInfo, castData, - }; + }); }; diff --git a/lib/v2/otobanana/livestream.js b/lib/v2/otobanana/livestream.js index e5bea69d9b..d47eda9056 100644 --- a/lib/v2/otobanana/livestream.js +++ b/lib/v2/otobanana/livestream.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { apiBase, baseUrl, getUserInfo, renderLive } = require('./utils'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const casts = liveData.results.map((item) => renderLive(item)); - ctx.state.data = { + ctx.set('data', { title: `${userInfo.name} (@${userInfo.username}) - ライブ配信 | OTOBANANA`, description: userInfo.bio.replaceAll('\n', ' '), link: `${baseUrl}/user/${id}`, @@ -20,10 +20,10 @@ module.exports = async (ctx) => { author: userInfo.name, itunes_author: userInfo.name, item: casts, - }; + }); - ctx.state.json = { + ctx.set('json', { userInfo, liveData, - }; + }); }; diff --git a/lib/v2/otobanana/timeline.js b/lib/v2/otobanana/timeline.js index 588e43930e..8d1298e972 100644 --- a/lib/v2/otobanana/timeline.js +++ b/lib/v2/otobanana/timeline.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { apiBase, baseUrl, getUserInfo, renderPost } = require('./utils'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const posts = postData.results.map((item) => renderPost(item)); - ctx.state.data = { + ctx.set('data', { title: `${userInfo.name} (@${userInfo.username}) - タイムライン | OTOBANANA`, description: userInfo.bio.replaceAll('\n', ' '), link: `${baseUrl}/user/${id}`, @@ -20,10 +20,10 @@ module.exports = async (ctx) => { author: userInfo.name, itunes_author: userInfo.name, item: posts, - }; + }); - ctx.state.json = { + ctx.set('json', { userInfo, postData, - }; + }); }; diff --git a/lib/v2/otobanana/utils.js b/lib/v2/otobanana/utils.js index 124d89d1d0..9a263c2149 100644 --- a/lib/v2/otobanana/utils.js +++ b/lib/v2/otobanana/utils.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const domain = 'otobanana.com'; diff --git a/lib/v2/ouc/it-postgraduate.js b/lib/v2/ouc/it-postgraduate.js index f492dc0519..26839b1fd9 100644 --- a/lib/v2/ouc/it-postgraduate.js +++ b/lib/v2/ouc/it-postgraduate.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const link = 'https://it.ouc.edu.cn/_s381/16619/list.psp'; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.col_news_list .news_list li'); - ctx.state.data = { + ctx.set('data', { title: '中国海洋大学信息科学与工程学院', link, description: '中国海洋大学信息科学与工程学院研究生招生通知公告', @@ -23,5 +23,5 @@ module.exports = async (ctx) => { pubDate: parseDate(item.find('span').text(), 'YYYY-MM-DD'), }; }), - }; + }); }; diff --git a/lib/v2/ouc/it-tx.js b/lib/v2/ouc/it-tx.js index 6c61855fa1..d31d8707ab 100644 --- a/lib/v2/ouc/it-tx.js +++ b/lib/v2/ouc/it-tx.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const host = 'https://it.ouc.edu.cn'; - const id = ctx.params.id || 'xwdt'; + const id = ctx.req.param('id') || 'xwdt'; const link = `${host}/tx/${id}/list.htm`; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const typeTitle = $('span.Column_Anchor').text(); const title = $('li.col_title h2').text(); @@ -27,7 +27,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.author = '中国海洋大学信息科学与工程学院'; item.description = $('.wp_articlecontent').html(); return item; @@ -35,10 +35,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `信息科学与工程学院团学工作 - ${typeTitle}${title === typeTitle ? '' : title}`, description: '中国海洋大学信息科学与工程学院团学工作', link, item: out, - }; + }); }; diff --git a/lib/v2/ouc/it.js b/lib/v2/ouc/it.js index b018c5bbba..665f5dd227 100644 --- a/lib/v2/ouc/it.js +++ b/lib/v2/ouc/it.js @@ -1,15 +1,15 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const host = 'https://it.ouc.edu.cn'; const typelist = ['学院要闻', '学院公告', '学术活动']; const urlList = ['xyyw/list.htm', 'xygg/list.htm', 'xshd/list.htm']; - const type = Number.parseInt(ctx.params.type) || 0; + const type = Number.parseInt(ctx.req.param('type')) || 0; const link = new URL(urlList[type], host).href; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.col_news_list .news_list li') .toArray() @@ -27,7 +27,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.author = '中国海洋大学信息科学与工程学院'; item.description = $('.wp_articlecontent').html(); return item; @@ -35,9 +35,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `中国海洋大学信息科学与工程学院${typelist[type]}`, link, item: out, - }; + }); }; diff --git a/lib/v2/ouc/jwc.js b/lib/v2/ouc/jwc.js index b1099775de..61aa7f7c2d 100644 --- a/lib/v2/ouc/jwc.js +++ b/lib/v2/ouc/jwc.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const link = 'https://jwc.ouc.edu.cn/6517/list.htm'; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.wp_article_list li') .toArray() .map((e) => { @@ -22,7 +22,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got('https://jwc.ouc.edu.cn' + item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.author = '中国海洋大学教务处'; item.description = $('.wp_articlecontent').html(); return item; @@ -30,10 +30,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '中国海洋大学教务处', link, description: '中国海洋大学教务处最新通知', item: out, - }; + }); }; diff --git a/lib/v2/ouc/jwgl.js b/lib/v2/ouc/jwgl.js index 6f2a882624..b9648825e8 100644 --- a/lib/v2/ouc/jwgl.js +++ b/lib/v2/ouc/jwgl.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const link = 'http://jwgl.ouc.edu.cn/public/listSchoolNotices.action?currentPage=1&recordsPerPage=15&qtitle='; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('div.datalist table tbody tr') .toArray() .map((e) => { @@ -26,17 +26,17 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.description = $('div.notice').html(); return item; }) ) ); - ctx.state.data = { + ctx.set('data', { title: '中国海洋大学选课信息教务通知', link, description: '中国海洋大学选课信息教务通知', item: out, - }; + }); }; diff --git a/lib/v2/ouc/yjs.js b/lib/v2/ouc/yjs.js index a428468b17..30b73ae13a 100644 --- a/lib/v2/ouc/yjs.js +++ b/lib/v2/ouc/yjs.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const link = 'https://yz.ouc.edu.cn/5926/list.htm'; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.wp_article_list li'); - ctx.state.data = { + ctx.set('data', { title: '中国海洋大学研究生院', link, description: '中国海洋大学研究生院通知公告', @@ -23,5 +23,5 @@ module.exports = async (ctx) => { pubDate: parseDate(item.find('.Article_PublishDate').text()), }; }), - }; + }); }; diff --git a/lib/v2/oup/index.js b/lib/v2/oup/index.js index a8191159b0..01b150bed6 100644 --- a/lib/v2/oup/index.js +++ b/lib/v2/oup/index.js @@ -1,18 +1,18 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const path = require('path'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const rootUrl = 'https://academic.oup.com'; module.exports = async (ctx) => { - const name = ctx.params.name; + const name = ctx.req.param('name'); const url = `${rootUrl}/${name}/issue`; const response = await got(url); const cookies = response.headers['set-cookie'].map((item) => item.split(';')[0]).join(';'); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('div.al-article-items') .map((_, item) => ({ title: $(item).find('a.at-articleLink').text(), @@ -28,7 +28,7 @@ module.exports = async (ctx) => { Cookie: cookies, }, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.author = content('a.linked-name.js-linked-name-trigger').text(); item.description = art(path.join(__dirname, 'templates/article.art'), { @@ -45,9 +45,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `OUP - ${name}`, link: url, item: items, - }; + }); }; diff --git a/lib/v2/outagereport/index.js b/lib/v2/outagereport/index.js index d69c54368f..d43d216276 100644 --- a/lib/v2/outagereport/index.js +++ b/lib/v2/outagereport/index.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const baseUrl = 'https://outage.report/'; module.exports = async (ctx) => { - const serviceName = ctx.params.name; // Which service do you want to monitor? Have to be the same as what it appears in URL. - const watchCount = ctx.params.count || 10; // How many reports is received during last 20 minutes? 10 reports as default. + const serviceName = ctx.req.param('name'); // Which service do you want to monitor? Have to be the same as what it appears in URL. + const watchCount = ctx.req.param('count') || 10; // How many reports is received during last 20 minutes? 10 reports as default. const url = `${baseUrl}${serviceName}`; const response = await got({ method: 'get', @@ -41,11 +41,11 @@ module.exports = async (ctx) => { } // how this RSS feed looks like - ctx.state.data = { + ctx.set('data', { title: `Is ${serviceName} Down Right Now?`, link: url, description: rssDescribe, item: outageHistory, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/panewslab/author.js b/lib/v2/panewslab/author.js index e5608461a5..9018f241c3 100644 --- a/lib/v2/panewslab/author.js +++ b/lib/v2/panewslab/author.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const rootUrl = 'https://panewslab.com'; - const apiUrl = `${rootUrl}/webapi/subject/articles?Rn=${ctx.query.limit ?? 25}&LId=1&tw=0&uid=${id}`; + const apiUrl = `${rootUrl}/webapi/subject/articles?Rn=${ctx.req.query('limit') ?? 25}&LId=1&tw=0&uid=${id}`; const currentUrl = `${rootUrl}/zh/author/${id}.html`; const response = await got({ @@ -31,7 +31,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description += content('#txtinfo').html(); @@ -40,9 +40,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `PANews - ${items[0].author}`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/panewslab/index.js b/lib/v2/panewslab/index.js index 0e8d52aa58..fc34cce18b 100644 --- a/lib/v2/panewslab/index.js +++ b/lib/v2/panewslab/index.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const categories = { 精选: '', @@ -18,10 +18,10 @@ const categories = { }; module.exports = async (ctx) => { - const category = ctx.params.category ?? '精选'; + const category = ctx.req.param('category') ?? '精选'; const rootUrl = 'https://panewslab.com'; - const apiUrl = `${rootUrl}/webapi/depth/list?LId=1&Rn=${ctx.query.limit ?? 25}&TagId=${categories[category]}&tw=0`; + const apiUrl = `${rootUrl}/webapi/depth/list?LId=1&Rn=${ctx.req.query('limit') ?? 25}&TagId=${categories[category]}&tw=0`; const currentUrl = `${rootUrl}/zh/profundity/index.html`; const response = await got({ @@ -46,7 +46,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description += content('#txtinfo').html(); @@ -55,9 +55,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `PANews - ${category}`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/panewslab/news.js b/lib/v2/panewslab/news.js index 2d861c418c..255cb332e6 100644 --- a/lib/v2/panewslab/news.js +++ b/lib/v2/panewslab/news.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const rootUrl = 'https://panewslab.com'; - const apiUrl = `${rootUrl}/webapi/flashnews?LId=1&Rn=${ctx.query.limit ?? 50}&tw=0`; + const apiUrl = `${rootUrl}/webapi/flashnews?LId=1&Rn=${ctx.req.query('limit') ?? 50}&tw=0`; const currentUrl = `${rootUrl}/zh/news/index.html`; const response = await got({ @@ -20,9 +20,9 @@ module.exports = async (ctx) => { category: item.tags, })); - ctx.state.data = { + ctx.set('data', { title: 'PANews - 快讯', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/panewslab/topic.js b/lib/v2/panewslab/topic.js index a35c73ac73..6a4a619214 100644 --- a/lib/v2/panewslab/topic.js +++ b/lib/v2/panewslab/topic.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const rootUrl = 'https://panewslab.com'; - const apiUrl = `${rootUrl}/webapi/subject/articles?Rn=${ctx.query.limit ?? 25}&LId=1&sid=${id}&tw=0`; + const apiUrl = `${rootUrl}/webapi/subject/articles?Rn=${ctx.req.query('limit') ?? 25}&LId=1&sid=${id}&tw=0`; const currentUrl = `${rootUrl}/zh/topiclist/${id}.html`; const response = await got({ @@ -31,7 +31,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description += content('#txtinfo').html(); @@ -40,9 +40,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `PANews - ${id}`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/papers/index.js b/lib/v2/papers/index.js index 5675e2fc05..17e7c96bf1 100644 --- a/lib/v2/papers/index.js +++ b/lib/v2/papers/index.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { const { category = 'arxiv/cs.CL' } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 150; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 150; const rootUrl = 'https://papers.cool'; const currentUrl = new URL(category, rootUrl).href; @@ -16,7 +16,7 @@ module.exports = async (ctx) => { const { data: response } = await got(currentUrl); - const $ = cheerio.load(response); + const $ = load(response); const pubDate = parseDate( $('p.info') @@ -64,7 +64,7 @@ module.exports = async (ctx) => { const title = $('title').text(); const icon = new URL('favicon.ico', rootUrl).href; - ctx.state.data = { + ctx.set('data', { item: items, title: title.split(/-/)[0].trim(), link: currentUrl, @@ -72,5 +72,5 @@ module.exports = async (ctx) => { icon, logo: icon, subtitle: $('h1').first().text(), - }; + }); }; diff --git a/lib/v2/paradigm/writing.js b/lib/v2/paradigm/writing.js index 5c5e3ce0fe..6836b6ff7a 100644 --- a/lib/v2/paradigm/writing.js +++ b/lib/v2/paradigm/writing.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseUrl = 'https://www.paradigm.xyz'; @@ -8,7 +8,7 @@ module.exports = async (ctx) => { const url = `${baseUrl}/writing`; const response = await got(url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const nextData = JSON.parse($('#__NEXT_DATA__').text()); const buildId = nextData.buildId; @@ -25,7 +25,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.api); - const $ = cheerio.load(response.data.pageProps.content, null, false); + const $ = load(response.data.pageProps.content, null, false); // Remove the TOC $('.toc').remove(); @@ -36,9 +36,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'Paradigm - Writing', link: url, item: items, - }; + }); }; diff --git a/lib/v2/parliament/section77.js b/lib/v2/parliament/section77.js index 6ceeaf22dc..93de266998 100644 --- a/lib/v2/parliament/section77.js +++ b/lib/v2/parliament/section77.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; const { CookieJar } = require('tough-cookie'); module.exports = async (ctx) => { @@ -53,7 +53,7 @@ module.exports = async (ctx) => { url, cookieJar, }); - const $ = cheerio.load(response); + const $ = load(response); if ($.text() === 'ยังไม่มีข้อมูล') { return result; @@ -84,7 +84,7 @@ module.exports = async (ctx) => { url: item.link, cookieJar, }); - const $ = cheerio.load(response); + const $ = load(response); // Select the first element with the class name 'comment-body' item.title = $('.title h5').first().text(); diff --git a/lib/v2/patagonia/new-arrivals.js b/lib/v2/patagonia/new-arrivals.js index d6947ed571..bf548729c5 100644 --- a/lib/v2/patagonia/new-arrivals.js +++ b/lib/v2/patagonia/new-arrivals.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); -const cheerio = require('cheerio'); +import { load } from 'cheerio'; const host = 'https://www.patagonia.com'; const categoryMap = { mens: ['mens-new', 'mens-new-arrivals'], @@ -28,7 +28,7 @@ module.exports = async (ctx) => { }); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('.product') .map(function () { const data = {}; @@ -47,7 +47,7 @@ module.exports = async (ctx) => { return data; }) .get(); - ctx.state.data = { + ctx.set('data', { title: `Patagonia - New Arrivals - ${category.toUpperCase()}`, link: `${host}/shop/${categoryMap[category][1]}`, description: `Patagonia - New Arrivals - ${category.toUpperCase()}`, @@ -57,5 +57,5 @@ module.exports = async (ctx) => { link: item.link, category: item.category, })), - }; + }); }; diff --git a/lib/v2/paulgraham/article.js b/lib/v2/paulgraham/article.js index c223a0109c..ace6713d99 100644 --- a/lib/v2/paulgraham/article.js +++ b/lib/v2/paulgraham/article.js @@ -1,16 +1,16 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 30; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 30; const rootUrl = 'http://paulgraham.com'; const currentUrl = new URL('articles.html', rootUrl).href; const { data: response } = await got(currentUrl); - const $ = cheerio.load(response); + const $ = load(response); let items = $('font a') .slice(0, limit) @@ -29,7 +29,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(item.link, async () => { const { data: detailResponse } = await got(item.link); - const content = cheerio.load(detailResponse); + const content = load(detailResponse); const description = content('font').first(); @@ -46,7 +46,7 @@ module.exports = async (ctx) => { const title = $('title').text(); const icon = $('link[rel="shortcut icon"]').prop('href'); - ctx.state.data = { + ctx.set('data', { item: items, title: `${author} - ${title}`, link: currentUrl, @@ -58,5 +58,5 @@ module.exports = async (ctx) => { subtitle: title, author, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/penguin-random-house/articles.js b/lib/v2/penguin-random-house/articles.js index 86e8afe132..d05cbc2888 100644 --- a/lib/v2/penguin-random-house/articles.js +++ b/lib/v2/penguin-random-house/articles.js @@ -1,11 +1,11 @@ const utils = require('./utils'); -const cheerio = require('cheerio'); -const got = require('@/utils/got'); +import { load } from 'cheerio'; +import got from '@/utils/got'; module.exports = async (ctx) => { const link = 'https://www.penguinrandomhouse.com/articles/'; const res = await got(link); - const $ = cheerio.load(res.data); + const $ = load(res.data); const itemArray = $('.archive-module-half-container,.archive-module-third-container') .map(function () { @@ -18,10 +18,10 @@ module.exports = async (ctx) => { const out = await utils.parseList(itemArray, ctx, utils.parseArticle); - ctx.state.data = { + ctx.set('data', { title: 'Penguin Random House Articles', link, description: 'In-depth interviews, author essays, fascinating essays. Go deeper into the books you love.', item: out, - }; + }); }; diff --git a/lib/v2/penguin-random-house/thereaddown.js b/lib/v2/penguin-random-house/thereaddown.js index b6ecd28b4c..c6ccc0a288 100644 --- a/lib/v2/penguin-random-house/thereaddown.js +++ b/lib/v2/penguin-random-house/thereaddown.js @@ -1,11 +1,11 @@ const utils = require('./utils'); -const cheerio = require('cheerio'); -const got = require('@/utils/got'); +import { load } from 'cheerio'; +import got from '@/utils/got'; module.exports = async (ctx) => { const link = 'https://www.penguinrandomhouse.com/the-read-down/'; const res = await got(link); - const $ = cheerio.load(res.data); + const $ = load(res.data); const itemArray = $('.archive-module-half-container,.archive-module-third-container') .map(function () { @@ -18,10 +18,10 @@ module.exports = async (ctx) => { const out = await utils.parseList(itemArray, ctx, utils.parseBooks); - ctx.state.data = { + ctx.set('data', { title: 'Penguin Random House Book Lists', link, description: 'Never wonder what to read next! Check out these lists to find your next favorite book.', item: out, - }; + }); }; diff --git a/lib/v2/penguin-random-house/utils.js b/lib/v2/penguin-random-house/utils.js index 2c6012542e..adf244fade 100644 --- a/lib/v2/penguin-random-house/utils.js +++ b/lib/v2/penguin-random-house/utils.js @@ -1,11 +1,11 @@ -const cheerio = require('cheerio'); -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import { load } from 'cheerio'; +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; const parseBookInList = (element) => { - const $ = cheerio.load(element); + const $ = load(element); const title = $('h2').first().text(); const author = $('h2.author').first().text(); const description = $('.desc').first().text(); @@ -48,7 +48,7 @@ const parsePubDate = (data) => { }; const parseBooks = (element) => { - const $ = cheerio.load(element); + const $ = load(element); const description = $('h2.read-down-text').first().html(); let mainBlock = ''; @@ -66,7 +66,7 @@ const parseBooks = (element) => { }; const parseArticle = (element) => { - const $ = cheerio.load(element); + const $ = load(element); const description = $('h2.hdr-smalltxt').first().html(); const imageSrc = $('div.img-block>img').first().attr('src'); const imageAlt = $('div.img-block>img').first().attr('alt'); @@ -79,7 +79,7 @@ const parseArticle = (element) => { }); $('div.main-content>p,div.main-content>ul').map((i, element) => { - const appending = cheerio.load(element); + const appending = load(element); mainBlock += appending.html(); return appending; }); diff --git a/lib/v2/people/index.js b/lib/v2/people/index.js index db0591f643..eb3078afdf 100644 --- a/lib/v2/people/index.js +++ b/lib/v2/people/index.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const iconv = require('iconv-lite'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const { isValidHost } = require('@/utils/valid-host'); module.exports = async (ctx) => { @@ -10,7 +10,7 @@ module.exports = async (ctx) => { let { category = site === 'www' ? '59476' : '' } = ctx.params; category = site === 'cpc' && category === '24h' ? '87228' : category; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 30; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 30; if (!isValidHost(site)) { throw new Error('Invalid site'); @@ -22,7 +22,7 @@ module.exports = async (ctx) => { responseType: 'buffer', }); - const $ = cheerio.load(iconv.decode(response, 'gbk')); + const $ = load(iconv.decode(response, 'gbk')); $('em').remove(); $('.bshare-more, .page_n, .page').remove(); @@ -55,7 +55,7 @@ module.exports = async (ctx) => { }); const data = iconv.decode(detailResponse, 'gbk'); - const content = cheerio.load(data); + const content = load(data); content('.paper_num, #rwb_tjyd').remove(); @@ -70,9 +70,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/people/liuyan.js b/lib/v2/people/liuyan.js index 724882a6d5..f1f4585d08 100644 --- a/lib/v2/people/liuyan.js +++ b/lib/v2/people/liuyan.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const fid = ctx.params.id; - const state = ctx.params.state ?? '1'; + const fid = ctx.req.param('id'); + const state = ctx.req.param('state') ?? '1'; const rootUrl = 'http://liuyan.people.com.cn'; const currentUrl = `${rootUrl}/threads/list?fid=${fid}#state=${state}`; @@ -36,7 +36,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('.content').html(); currentForum = currentForum ?? content('#currentForum').text(); @@ -46,9 +46,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${currentForum} - 领导留言板 - 人民网`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/people/xjpjh.js b/lib/v2/people/xjpjh.js index 874b7e0572..5364519f71 100644 --- a/lib/v2/people/xjpjh.js +++ b/lib/v2/people/xjpjh.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const url = require('url'); const host = 'http://jhsjk.people.cn'; module.exports = async (ctx) => { - let keyword = ctx.params.keyword || 'all'; - let year = ctx.params.year || 0; + let keyword = ctx.req.param('keyword') || 'all'; + let year = ctx.req.param('year') || 0; let title = '习近平系列重要讲话'; title = title + '-' + keyword; @@ -23,7 +23,7 @@ module.exports = async (ctx) => { const link = `http://jhsjk.people.cn/result?keywords=${keyword}&year=${year}`; const response = await got.get(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('ul.list_14.p1_2.clearfix li') .slice(0, 10) @@ -47,7 +47,7 @@ module.exports = async (ctx) => { } const response = await got.get(itemUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const description = $('div.d2txt_con.clearfix').html().trim(); const single = { @@ -60,9 +60,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title, link, item: out, - }; + }); }; diff --git a/lib/v2/peopo/topic.js b/lib/v2/peopo/topic.js index e0c84e484a..d3a19f0aea 100644 --- a/lib/v2/peopo/topic.js +++ b/lib/v2/peopo/topic.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const baseUrl = 'https://www.peopo.org'; module.exports = async (ctx) => { const { topicId = '159' } = ctx.params; const url = `${baseUrl}/topic/${topicId}`; const response = await got(url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.view-list-title') .toArray() .map((item) => { @@ -23,7 +23,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.author = $('#user-info h3').text(); item.category = $('#node-terms .inline li') @@ -37,10 +37,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link: url, language: 'zh-TW', item: items, - }; + }); }; diff --git a/lib/v2/phoronix/index.js b/lib/v2/phoronix/index.js index 45f93e644c..ffab2b236d 100644 --- a/lib/v2/phoronix/index.js +++ b/lib/v2/phoronix/index.js @@ -1,6 +1,6 @@ const parser = require('@/utils/rss-parser'); -const cheerio = require('cheerio'); -const got = require('@/utils/got'); +import { load } from 'cheerio'; +import got from '@/utils/got'; const dayjs = require('dayjs'); dayjs.extend(require('dayjs/plugin/utc')); dayjs.extend(require('dayjs/plugin/timezone')); @@ -41,7 +41,7 @@ const feedFetch = async () => { }; const webFetchCb = (response) => { - const $ = cheerio.load(response.body); + const $ = load(response.body); return { title: $('title').text(), link: response.url, @@ -129,7 +129,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(`${articleCacheKey}:${item.link}`, async () => { const response = await got(item.link); const html = response.body; - const $ = cheerio.load(html); + const $ = load(html); const content = $('.content'); // Author @@ -191,7 +191,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(link, async () => { const response = await got(link); const html = response.data; - const $$ = cheerio.load(html); + const $$ = load(html); const page = $$('.content'); return page.html(); }) diff --git a/lib/v2/pianyuan/app.js b/lib/v2/pianyuan/app.js index 9c68f4f2c9..2dde299a4d 100644 --- a/lib/v2/pianyuan/app.js +++ b/lib/v2/pianyuan/app.js @@ -1,8 +1,8 @@ -const cheerio = require('cheerio'); +import { load } from 'cheerio'; const utils = require('./utils'); module.exports = async (ctx) => { - const media = ctx.params.media ?? -1; + const media = ctx.req.param('media') ?? -1; const link_base = 'https://pianyuan.org/'; let description = '电影和剧集'; let link = link_base; @@ -18,17 +18,17 @@ module.exports = async (ctx) => { } const response = await utils.request(link, ctx.cache); - const $ = cheerio.load(response.data); + const $ = load(response.data); const detailLinks = $('#main-container > div > div.col-md-10 > table > tbody > tr') .get() .map((tr) => $(tr).find('td.dt.prel.nobr > a').attr('href')); detailLinks.shift(); const items = await utils.ProcessFeed(detailLinks, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: '片源网', description, link: link_base, item: items, - }; + }); }; diff --git a/lib/v2/pianyuan/search.js b/lib/v2/pianyuan/search.js index 4f72607f0e..c5b30dea35 100644 --- a/lib/v2/pianyuan/search.js +++ b/lib/v2/pianyuan/search.js @@ -1,4 +1,4 @@ -const cheerio = require('cheerio'); +import { load } from 'cheerio'; const utils = require('./utils'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const link = link_base + `search?q=${searchKey}`; const response = await utils.request(link, ctx.cache); - const $ = cheerio.load(response.data); + const $ = load(response.data); // 只获取第一页的搜索结果 const searchLinks = $('.nomt > a') .get() @@ -25,7 +25,7 @@ module.exports = async (ctx) => { const link = new URL(e, link_base).href; const single = await ctx.cache.tryGet(link, async () => { const res = await utils.request(link, ctx.cache); - const content = cheerio.load(res.data); + const content = load(res.data); content('.ico.ico_bt') .get() .map((a) => detailLinks.push($(a).attr('href'))); @@ -36,10 +36,10 @@ module.exports = async (ctx) => { const items = await utils.ProcessFeed(detailLinks, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: '片源网', description, link: link_base, item: items, - }; + }); }; diff --git a/lib/v2/pianyuan/utils.js b/lib/v2/pianyuan/utils.js index 994a998504..5aff5b27e3 100644 --- a/lib/v2/pianyuan/utils.js +++ b/lib/v2/pianyuan/utils.js @@ -1,6 +1,6 @@ -const cheerio = require('cheerio'); -const got = require('@/utils/got'); -const config = require('@/config').value; +import { load } from 'cheerio'; +import got from '@/utils/got'; +import { config } from '@/config'; const security_key = 'pianyuan-security_session_verify'; const PHPSESSID_key = 'pianyuan-PHPSESSID'; const loginauth_key = 'pianyuan-py_loginauth'; @@ -13,7 +13,7 @@ const ProcessFeed = async (list, cache) => { const link = new URL(e, link_base).href; const single = await cache.tryGet(link, async () => { const response = await request(link, cache); - const content = cheerio.load(response.data); + const content = load(response.data); const magnet = content('.btn-primary').attr('href'); const torrent_name = content('body > div.jumbotron.masthead > div > div > div.col-sm-10.col-md-10.col-lg-10.text-left > h1').text(); const name = content('body > div.jumbotron.masthead > div > div > div.col-sm-10.col-md-10.col-lg-10.text-left > h2 > a').text(); diff --git a/lib/v2/picnob/user.js b/lib/v2/picnob/user.js index f8c4dc29ed..169b10d8af 100644 --- a/lib/v2/picnob/user.js +++ b/lib/v2/picnob/user.js @@ -1,16 +1,17 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const { puppeteerGet } = require('./utils'); +import puppeteer from '@/utils/puppeteer'; module.exports = async (ctx) => { const baseUrl = 'https://www.picnob.com'; const { id } = ctx.params; const url = `${baseUrl}/profile/${id}/`; - const browser = await require('@/utils/puppeteer')(); + const browser = puppeteer(); // TODO: can't bypass cloudflare 403 error without puppeteer let html; let usePuppeteer = false; @@ -28,7 +29,7 @@ module.exports = async (ctx) => { usePuppeteer = true; } } - const $ = cheerio.load(html); + const $ = load(html); const profileName = $('h1.fullname').text(); const userId = $('input[name=userid]').attr('value'); @@ -61,7 +62,7 @@ module.exports = async (ctx) => { const { data } = await got(link); html = data; } - const $ = cheerio.load(html); + const $ = load(html); return [ ...new Set( $('.post_slide a') @@ -88,11 +89,11 @@ module.exports = async (ctx) => { ); await browser.close(); - ctx.state.data = { + ctx.set('data', { title: `${profileName} (@${id}) - Picnob`, description: $('.info .sum').text(), link: url, image: $('.ava .pic img').attr('src'), item: list, - }; + }); }; diff --git a/lib/v2/picuki/profile.js b/lib/v2/picuki/profile.js index a65d6c61cb..98ca28a932 100644 --- a/lib/v2/picuki/profile.js +++ b/lib/v2/picuki/profile.js @@ -1,12 +1,13 @@ -const cheerio = require('cheerio'); +import { load } from 'cheerio'; const chrono = require('chrono-node'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); -const config = require('@/config').value; +import { config } from '@/config'; const { puppeteerGet } = require('./utils'); +import puppeteer from '@/utils/puppeteer'; function deVideo(media) { - const $ = cheerio.load(media); + const $ = load(media); let media_deVideo = ''; $('img,video').each((_, medium) => { const tag = medium.name; @@ -20,11 +21,11 @@ function deVideo(media) { module.exports = async (ctx) => { // use Puppeteer due to the obstacle by cloudflare challenge - const browser = await require('@/utils/puppeteer')(); + const browser = puppeteer(); - const id = ctx.params.id; - const displayVideo = ctx.params.functionalFlag !== '0'; - const includeStories = ctx.params.functionalFlag === '10'; + const id = ctx.req.param('id'); + const displayVideo = ctx.req.param('functionalFlag') !== '0'; + const includeStories = ctx.req.param('functionalFlag') === '10'; const profileUrl = `https://www.picuki.com/profile/${id}`; @@ -37,7 +38,7 @@ module.exports = async (ctx) => { config.cache.routeExpire, false ); - const $ = cheerio.load(data); + const $ = load(data); const profileName = $('.profile-name-bottom').text(); const profileImg = $('.profile-avatar > img').attr('src'); @@ -99,7 +100,7 @@ module.exports = async (ctx) => { // re-cache it await ctx.cache.set(url, data); } - const $ = cheerio.load(data); + const $ = load(data); // Instagram 允许最多 10 条图片/视频任意混合于一条 post，picuki 在所有情况下都会将它（们）置于 .single-photo 内 let html = ''; $('.single-photo img').each((_, item) => { @@ -161,11 +162,11 @@ module.exports = async (ctx) => { await browser.close(); - ctx.state.data = { + ctx.set('data', { title: `${profileName} (@${id}) - Picuki`, link: profileUrl, image: profileImg, description: profileDescription, item: items, - }; + }); }; diff --git a/lib/v2/pikabu/community.js b/lib/v2/pikabu/community.js index 45c71feae5..cddda1317f 100644 --- a/lib/v2/pikabu/community.js +++ b/lib/v2/pikabu/community.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { baseUrl, fixImage, fixVideo } = require('./utils'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const { data: response } = await got(`${baseUrl}/ajax/${type}/${name}${sortString}`); const items = response.data.stories.map((story) => { - const $ = cheerio.load(story.html, null, false); + const $ = load(story.html, null, false); const data = JSON.parse($('script[type="application/ld+json"]').text()); const content = $('.story__main'); @@ -28,10 +28,10 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: response.data.title, link: `${baseUrl}/${type}/${name}`, language: 'ru-RU', item: items, - }; + }); }; diff --git a/lib/v2/pikabu/user.js b/lib/v2/pikabu/user.js index 25fbbd6fc2..3b7324d873 100644 --- a/lib/v2/pikabu/user.js +++ b/lib/v2/pikabu/user.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const iconv = require('iconv-lite'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; const { baseUrl, fixImage, fixVideo } = require('./utils'); module.exports = async (ctx) => { @@ -12,7 +12,7 @@ module.exports = async (ctx) => { }); const charset = response.headers['content-type'].match(/charset=([\w-]+)/)[1]; // windows-1251 - const $ = cheerio.load(iconv.decode(response.data, charset)); + const $ = load(iconv.decode(response.data, charset)); const items = $('.story__main') .not('.story__placeholder') @@ -35,12 +35,12 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('meta[property="og:title"]').attr('content'), description: $('.profile__user-about-content').text(), image: $('meta[property="og:image"]').attr('content'), language: 'ru-RU', link, item: items, - }; + }); }; diff --git a/lib/v2/pikabu/utils.js b/lib/v2/pikabu/utils.js index d5acaafe61..f9379ce9db 100644 --- a/lib/v2/pikabu/utils.js +++ b/lib/v2/pikabu/utils.js @@ -1,4 +1,4 @@ -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); const baseUrl = 'https://pikabu.ru'; diff --git a/lib/v2/pincong/hot.js b/lib/v2/pincong/hot.js index cfaa8caa84..64da97c306 100644 --- a/lib/v2/pincong/hot.js +++ b/lib/v2/pincong/hot.js @@ -1,5 +1,5 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { baseUrl, puppeteerGet } = require('./utils'); module.exports = async (ctx) => { @@ -10,10 +10,10 @@ module.exports = async (ctx) => { // use Puppeteer due to the obstacle by cloudflare challenge const html = await puppeteerGet(url, ctx.cache); - const $ = cheerio.load(html); + const $ = load(html); const list = $('div.aw-item'); - ctx.state.data = { + ctx.set('data', { title: '品葱 - 精选', link: `${baseUrl}/hot/${category === '0' ? '' : `category-${category}`}`, item: list @@ -24,5 +24,5 @@ module.exports = async (ctx) => { pubDate: parseDate($(item).find('div.mod-footer .aw-small-text').text()), })) .get(), - }; + }); }; diff --git a/lib/v2/pincong/index.js b/lib/v2/pincong/index.js index 90af5e800e..0f7b243f0b 100644 --- a/lib/v2/pincong/index.js +++ b/lib/v2/pincong/index.js @@ -1,5 +1,5 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { baseUrl, puppeteerGet } = require('./utils'); module.exports = async (ctx) => { @@ -11,16 +11,16 @@ module.exports = async (ctx) => { hot: 'sort_type-hot__day2', }; - url += (ctx.params.sort && sortMap[ctx.params.sort]) || 'recommend-1'; - url += ctx.params.category ? '__category-' + ctx.params.category : ''; + url += (ctx.req.param('sort') && sortMap[ctx.req.param('sort')]) || 'recommend-1'; + url += ctx.req.param('category') ? '__category-' + ctx.req.param('category') : ''; // use Puppeteer due to the obstacle by cloudflare challenge const html = await puppeteerGet(url, ctx.cache); - const $ = cheerio.load(html); + const $ = load(html); const list = $('div.aw-item'); - ctx.state.data = { + ctx.set('data', { title: '品葱 - 发现', link: url, item: list @@ -30,5 +30,5 @@ module.exports = async (ctx) => { pubDate: parseDate($(item).attr('data-created-at') * 1000), })) .get(), - }; + }); }; diff --git a/lib/v2/pincong/topic.js b/lib/v2/pincong/topic.js index 6f46087f00..f22150bacf 100644 --- a/lib/v2/pincong/topic.js +++ b/lib/v2/pincong/topic.js @@ -1,18 +1,18 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { baseUrl, puppeteerGet } = require('./utils'); module.exports = async (ctx) => { - const url = `${baseUrl}/topic/${ctx.params.topic}`; + const url = `${baseUrl}/topic/${ctx.req.param('topic')}`; // use Puppeteer due to the obstacle by cloudflare challenge const html = await puppeteerGet(url, ctx.cache); - const $ = cheerio.load(html); + const $ = load(html); const list = $('div.aw-item'); - ctx.state.data = { - title: `品葱 - ${ctx.params.topic}`, + ctx.set('data', { + title: `品葱 - ${ctx.req.param('topic')}`, link: url, item: list .map((_, item) => ({ @@ -21,5 +21,5 @@ module.exports = async (ctx) => { pubDate: parseDate($(item).attr('data-created-at') * 1000), })) .get(), - }; + }); }; diff --git a/lib/v2/pincong/utils.js b/lib/v2/pincong/utils.js index abcef2837c..b3aa916679 100644 --- a/lib/v2/pincong/utils.js +++ b/lib/v2/pincong/utils.js @@ -1,8 +1,10 @@ +import puppeteer from '@/utils/puppeteer'; + const baseUrl = 'https://pincong.rocks'; const puppeteerGet = (url, cache) => cache.tryGet(url, async () => { - const browser = await require('@/utils/puppeteer')(); + const browser = puppeteer(); const page = await browser.newPage(); await page.setRequestInterception(true); page.on('request', (request) => { diff --git a/lib/v2/pingwest/status.js b/lib/v2/pingwest/status.js index b535e26988..3efa06de3e 100644 --- a/lib/v2/pingwest/status.js +++ b/lib/v2/pingwest/status.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const baseUrl = 'https://www.pingwest.com'; @@ -13,12 +13,12 @@ module.exports = async (ctx) => { Referer: baseUrl, }, }); - const $ = cheerio.load(response.data.data.list); + const $ = load(response.data.data.list); const items = $('section.item') .toArray() .map((ele) => { const timestamp = ele.attribs['data-t']; - const $item = cheerio.load(ele); + const $item = load(ele); const rightNode = $item('.news-info'); const tag = rightNode.find('.item-tag-list').text(); const title = rightNode.find('.title').text(); @@ -38,10 +38,10 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: '品玩 - 实时要闻', description: '品玩 - 实时要闻', link: `${baseUrl}/status`, item: items, - }; + }); }; diff --git a/lib/v2/pingwest/tag.js b/lib/v2/pingwest/tag.js index 7b2958813d..84f0a3907c 100644 --- a/lib/v2/pingwest/tag.js +++ b/lib/v2/pingwest/tag.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const utils = require('./utils'); module.exports = async (ctx) => { @@ -14,7 +14,7 @@ module.exports = async (ctx) => { Referer: baseUrl, }, }); - const $ = cheerio.load(res.data); + const $ = load(res.data); const tagId = $('.tag-detail').attr('data-id'); const tagName = $('.tag-detail .info .title').text(); return { tagId, tagName }; @@ -31,13 +31,13 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(response.data.data.list); + const $ = load(response.data.data.list); const items = await utils.articleListParser($, needFullText, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: `品玩 - ${tagName}`, description: `品玩 - ${tagName}`, link: tagUrl, item: items, - }; + }); }; diff --git a/lib/v2/pingwest/user.js b/lib/v2/pingwest/user.js index 58f8c21ee1..7722ee74d4 100644 --- a/lib/v2/pingwest/user.js +++ b/lib/v2/pingwest/user.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const utils = require('./utils'); module.exports = async (ctx) => { @@ -12,7 +12,7 @@ module.exports = async (ctx) => { Referer: baseUrl, }, }); - const $ = cheerio.load(res.data); + const $ = load(res.data); const userInfoNode = $('#J_userId'); return { userName: userInfoNode.text(), @@ -32,7 +32,7 @@ module.exports = async (ctx) => { Referer: baseUrl, }, }); - const $ = cheerio.load(response.data.data.list); + const $ = load(response.data.data.list); let item = []; const needFullText = option === 'fulltext'; @@ -49,11 +49,11 @@ module.exports = async (ctx) => { article: '文章', state: '动态', }; - ctx.state.data = { + ctx.set('data', { title: `品玩 - ${userName} - ${typeToLabel[type]}`, description: userSign, image: userAvatar, link: aimUrl, item, - }; + }); }; diff --git a/lib/v2/pingwest/utils.js b/lib/v2/pingwest/utils.js index 6d63b0c5e8..d2b0f229b4 100644 --- a/lib/v2/pingwest/utils.js +++ b/lib/v2/pingwest/utils.js @@ -1,7 +1,7 @@ -const cheerio = require('cheerio'); -const got = require('@/utils/got'); +import { load } from 'cheerio'; +import got from '@/utils/got'; const { parseDate, parseRelativeDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import timezone from '@/utils/timezone'; const modifiedLink = (link) => (link.startsWith('http') ? link : `https:${link}`); @@ -10,7 +10,7 @@ const statusListParser = ($) => { .toArray() .map((ele) => { const timestamp = ele.attribs.pt; - const $item = cheerio.load(ele); + const $item = load(ele); const mainNode = $item('.news-detail'); const imgsStr = mainNode .find('img') @@ -37,7 +37,7 @@ const articleListParser = async ($, needFullText, cache) => { $('.item') .toArray() .map(async (ele) => { - const $item = cheerio.load(ele); + const $item = load(ele); let titleNode, authorNode; if ($item('.news-detail').children().length <= 2) { @@ -76,7 +76,7 @@ const articleListParser = async ($, needFullText, cache) => { const getFullArticle = (link, cache) => cache.tryGet(link, async () => { const { data } = await got(link); - const $ = cheerio.load(data); + const $ = load(data); $('img').each((_, ele) => { if (ele.attribs.src.includes('?x-')) { ele.attribs.src = ele.attribs.src.split('?x-')[0]; diff --git a/lib/v2/pixabay/search.js b/lib/v2/pixabay/search.js index 5c01c2d31b..31b516cf69 100644 --- a/lib/v2/pixabay/search.js +++ b/lib/v2/pixabay/search.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const config = require('@/config').value; -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { config } from '@/config'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -16,7 +16,7 @@ module.exports = async (ctx) => { key, q, order, - per_page: ctx.query.limit ?? 200, + per_page: ctx.req.query('limit') ?? 200, }, }); return data; @@ -39,12 +39,12 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: `Search ${q} - Pixabay`, description: 'Download & use free nature stock photos in high resolution ✓ New free images everyday ✓ HD to 4K ✓ Best nature pictures for all devices on Pixabay', link: `${baseUrl}/images/search/${q}/${order === 'latest' ? '?order=latest' : ''}`, image: `https://pixabay.com/apple-touch-icon.png`, language: 'en', item: items, - }; + }); }; diff --git a/lib/v2/pixiv/bookmarks.js b/lib/v2/pixiv/bookmarks.js index 3b9ebee956..98b28ebb67 100644 --- a/lib/v2/pixiv/bookmarks.js +++ b/lib/v2/pixiv/bookmarks.js @@ -1,16 +1,16 @@ const { getToken } = require('./token'); const getBookmarks = require('./api/get-bookmarks'); const getUserDetail = require('./api/get-user-detail'); -const config = require('@/config').value; +import { config } from '@/config'; const pixivUtils = require('./utils'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { if (!config.pixiv || !config.pixiv.refreshToken) { throw new Error('pixiv RSS is disabled due to the lack of relevant config'); } - const id = ctx.params.id; + const id = ctx.req.param('id'); const token = await getToken(ctx.cache.tryGet); if (!token) { @@ -22,7 +22,7 @@ module.exports = async (ctx) => { const illusts = bookmarksResponse.data.illusts; const username = userDetailResponse.data.user.name; - ctx.state.data = { + ctx.set('data', { title: `${username} 的收藏`, link: `https://www.pixiv.net/users/${id}/bookmarks/artworks`, description: `${username} 的 pixiv 最新收藏`, @@ -36,5 +36,5 @@ module.exports = async (ctx) => { link: `https://www.pixiv.net/artworks/${illust.id}`, }; }), - }; + }); }; diff --git a/lib/v2/pixiv/illustfollow.js b/lib/v2/pixiv/illustfollow.js index 608906024f..e9e5c60a63 100644 --- a/lib/v2/pixiv/illustfollow.js +++ b/lib/v2/pixiv/illustfollow.js @@ -1,8 +1,8 @@ const { getToken } = require('./token'); const getIllustFollows = require('./api/get-illust-follows'); -const config = require('@/config').value; +import { config } from '@/config'; const pixivUtils = require('./utils'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { if (!config.pixiv || !config.pixiv.refreshToken) { @@ -16,7 +16,7 @@ module.exports = async (ctx) => { const response = await getIllustFollows(token); const illusts = response.data.illusts; - ctx.state.data = { + ctx.set('data', { title: `Pixiv关注的新作品`, link: 'https://www.pixiv.net/bookmark_new_illust.php', description: `Pixiv关注的画师们的最新作品`, @@ -30,5 +30,5 @@ module.exports = async (ctx) => { link: `https://www.pixiv.net/artworks/${illust.id}`, }; }), - }; + }); }; diff --git a/lib/v2/pixiv/novels.js b/lib/v2/pixiv/novels.js index 884b02fdd4..7146279ac7 100644 --- a/lib/v2/pixiv/novels.js +++ b/lib/v2/pixiv/novels.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const baseUrl = 'https://www.pixiv.net'; module.exports = async (ctx) => { @@ -37,11 +37,11 @@ module.exports = async (ctx) => { category: item.tags, })); - ctx.state.data = { + ctx.set('data', { title: data.body.extraData.meta.title, description: data.body.extraData.meta.ogp.description, image: Object.values(data.body.works)[0].profileImageUrl, link: url, item: items, - }; + }); }; diff --git a/lib/v2/pixiv/pixiv-got.js b/lib/v2/pixiv/pixiv-got.js index 2195cc350e..98b2ec57eb 100644 --- a/lib/v2/pixiv/pixiv-got.js +++ b/lib/v2/pixiv/pixiv-got.js @@ -1,8 +1,8 @@ const tls = require('tls'); const ipRegex = require('ip-regex'); -const got = require('@/utils/got'); +import got from '@/utils/got'; const logger = require('@/utils/logger'); -const pixivConfig = require('@/config').value.pixiv; +import { config } from '@/config'; async function dohResolve(name, jsonDohEndpoint) { try { @@ -31,19 +31,19 @@ const pixivGot = got.extend({ hooks: { beforeRequest: [ async (options) => { - if (!pixivConfig.bypassCdn) { + if (!config.pixiv.bypassCdn) { return; } let hostname = null; - const isIP = ipRegex({ exact: true }).test(pixivConfig.bypassCdnHostname); + const isIP = ipRegex({ exact: true }).test(config.pixiv.bypassCdnHostname); if (isIP) { - hostname = pixivConfig.bypassCdnHostname; + hostname = config.pixiv.bypassCdnHostname; } else { - const addresses = await dohResolve(pixivConfig.bypassCdnHostname, pixivConfig.bypassCdnDoh); + const addresses = await dohResolve(config.pixiv.bypassCdnHostname, config.pixiv.bypassCdnDoh); if (addresses.length) { hostname = addresses[Math.floor(addresses.length * Math.random())]; } else { - logger.warn(`No IPv4 address resolved from ${pixivConfig.bypassCdnHostname}`); + logger.warn(`No IPv4 address resolved from ${config.pixiv.bypassCdnHostname}`); } } if (hostname) { diff --git a/lib/v2/pixiv/ranking.js b/lib/v2/pixiv/ranking.js index c56178d5f7..8322906b73 100644 --- a/lib/v2/pixiv/ranking.js +++ b/lib/v2/pixiv/ranking.js @@ -1,8 +1,8 @@ const { getToken } = require('./token'); const getRanking = require('./api/get-ranking'); -const config = require('@/config').value; +import { config } from '@/config'; const pixivUtils = require('./utils'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; const titles = { day: 'pixiv 日排行', @@ -60,22 +60,22 @@ module.exports = async (ctx) => { throw new Error('pixiv RSS is disabled due to the lack of relevant config'); } - const mode = alias[ctx.params.mode] ?? ctx.params.mode; - const date = ctx.params.date ? new Date(ctx.params.date) : new Date(); + const mode = alias[ctx.req.param('mode')] ?? ctx.req.param('mode'); + const date = ctx.req.param('date') ? new Date(ctx.req.param('date')) : new Date(); const token = await getToken(ctx.cache.tryGet); if (!token) { throw new Error('pixiv not login'); } - const response = await getRanking(mode, ctx.params.date && date, token); + const response = await getRanking(mode, ctx.req.param('date') && date, token); const illusts = response.data.illusts; const dateStr = `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日 `; - ctx.state.data = { - title: (ctx.params.date ? dateStr : '') + titles[mode], + ctx.set('data', { + title: (ctx.req.param('date') ? dateStr : '') + titles[mode], link: links[mode], description: dateStr + titles[mode], item: illusts.map((illust, index) => { @@ -89,5 +89,5 @@ module.exports = async (ctx) => { category: illust.tags.map((tag) => tag.name), }; }), - }; + }); }; diff --git a/lib/v2/pixiv/search.js b/lib/v2/pixiv/search.js index 8c89dcc909..aa11c7e0ee 100644 --- a/lib/v2/pixiv/search.js +++ b/lib/v2/pixiv/search.js @@ -1,18 +1,18 @@ const { getToken } = require('./token'); const searchPopularIllust = require('./api/search-popular-illust'); const searchIllust = require('./api/search-illust'); -const config = require('@/config').value; +import { config } from '@/config'; const pixivUtils = require('./utils'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { if (!config.pixiv || !config.pixiv.refreshToken) { throw new Error('pixiv RSS is disabled due to the lack of relevant config'); } - const keyword = ctx.params.keyword; - const order = ctx.params.order || 'date'; - const mode = ctx.params.mode; + const keyword = ctx.req.param('keyword'); + const order = ctx.req.param('order') || 'date'; + const mode = ctx.req.param('mode'); const token = await getToken(ctx.cache.tryGet); if (!token) { @@ -28,7 +28,7 @@ module.exports = async (ctx) => { illusts = illusts.filter((item) => item.x_restrict === 1); } - ctx.state.data = { + ctx.set('data', { title: `${keyword} 的 pixiv ${order === 'popular' ? '热门' : ''}内容`, link: `https://www.pixiv.net/tags/${keyword}/artworks`, item: illusts.map((illust) => { @@ -42,5 +42,5 @@ module.exports = async (ctx) => { }; }), allowEmpty: true, - }; + }); }; diff --git a/lib/v2/pixiv/token.js b/lib/v2/pixiv/token.js index 87dcec0261..85caa503f0 100644 --- a/lib/v2/pixiv/token.js +++ b/lib/v2/pixiv/token.js @@ -1,4 +1,4 @@ -const config = require('@/config').value; +import { config } from '@/config'; const logger = require('@/utils/logger'); const got = require('./pixiv-got'); const { maskHeader } = require('./constants'); diff --git a/lib/v2/pixiv/user.js b/lib/v2/pixiv/user.js index 46c2d6eb5c..1e2fbfa3ec 100644 --- a/lib/v2/pixiv/user.js +++ b/lib/v2/pixiv/user.js @@ -1,15 +1,15 @@ const { getToken } = require('./token'); const getIllusts = require('./api/get-illusts'); -const config = require('@/config').value; +import { config } from '@/config'; const pixivUtils = require('./utils'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { if (!config.pixiv || !config.pixiv.refreshToken) { throw new Error('pixiv RSS is disabled due to the lack of relevant config'); } - const id = ctx.params.id; + const id = ctx.req.param('id'); const token = await getToken(ctx.cache.tryGet); if (!token) { throw new Error('pixiv not login'); @@ -20,7 +20,7 @@ module.exports = async (ctx) => { const illusts = response.data.illusts; const username = illusts[0].user.name; - ctx.state.data = { + ctx.set('data', { title: `${username} 的 pixiv 动态`, link: `https://www.pixiv.net/users/${id}`, description: `${username} 的 pixiv 最新动态`, @@ -35,5 +35,5 @@ module.exports = async (ctx) => { category: illust.tags.map((t) => t.name), }; }), - }; + }); }; diff --git a/lib/v2/pixiv/utils.js b/lib/v2/pixiv/utils.js index 3b6292772f..44fc349f1a 100644 --- a/lib/v2/pixiv/utils.js +++ b/lib/v2/pixiv/utils.js @@ -1,4 +1,4 @@ -const config = require('@/config').value; +import { config } from '@/config'; module.exports = { getImgs(illust) { diff --git a/lib/v2/piyao/jrpy.js b/lib/v2/piyao/jrpy.js index 58b9dc500f..ecf604b47f 100644 --- a/lib/v2/piyao/jrpy.js +++ b/lib/v2/piyao/jrpy.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const rootUrl = 'https://www.piyao.org.cn'; @@ -8,7 +8,7 @@ module.exports = async (ctx) => { const currentUrl = `${rootUrl}/jrpy/index.htm`; const response = await got(currentUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('ul#list li') .map((_, item) => ({ title: $(item).find('a').text(), @@ -20,7 +20,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const detailResponse = await got(item.link); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.title = content('div.con_tit > h2').text(); item.description = content('div.con_txt').html(); @@ -31,9 +31,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '今日辟谣', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/pkmer/recent.js b/lib/v2/pkmer/recent.js index 8989f68864..d90e4c08db 100644 --- a/lib/v2/pkmer/recent.js +++ b/lib/v2/pkmer/recent.js @@ -1,21 +1,21 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const baseUrl = 'https://pkmer.cn'; module.exports = async (ctx) => { const { data: response } = await got(`${baseUrl}/page/1/`); - const $ = cheerio.load(response); + const $ = load(response); const items = process($); - ctx.state.data = { + ctx.set('data', { title: 'PKMer', icon: 'https://cdn.pkmer.cn/covers/logo.png!nomark', logo: 'https://cdn.pkmer.cn/covers/logo.png!nomark', link: baseUrl, allowEmpty: true, item: items, - }; + }); }; function process($) { diff --git a/lib/v2/pku/bbs/hot.js b/lib/v2/pku/bbs/hot.js index 9fd00a085d..0c999815ad 100644 --- a/lib/v2/pku/bbs/hot.js +++ b/lib/v2/pku/bbs/hot.js @@ -1,8 +1,8 @@ -const config = require('@/config').value; -const cheerio = require('cheerio'); -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { config } from '@/config'; +import { load } from 'cheerio'; +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const cookie = config.pkubbs.cookie; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { headers.cookie = cookie; } const r = await got('https://bbs.pku.edu.cn/v2/hot-topic.php', { headers }); - const $ = cheerio.load(r.body); + const $ = load(r.body); const listItems = $('#list-content .list-item') .map(function () { return { @@ -28,7 +28,7 @@ module.exports = async (ctx) => { // try catch 处理部分无 Cookie 时无法访问的帖子 try { const r = await got(url, { headers }); - const $ = cheerio.load(r.body); + const $ = load(r.body); const date = $('.post-card:first-child .sl-triangle-container .down-list span').text() || $('.post-card:first-child .sl-triangle-container .title span').text(); return { title, @@ -47,10 +47,10 @@ module.exports = async (ctx) => { }) ) ); - ctx.state.data = { + ctx.set('data', { title: '北大未名BBS 全站十大', link: 'https://bbs.pku.edu.cn/v2/hot-topic.php', description: '北大未名BBS 全站热门话题前十名', item, - }; + }); }; diff --git a/lib/v2/pku/cls/announcement.js b/lib/v2/pku/cls/announcement.js index 3476b9d9bb..18f6a3ab46 100644 --- a/lib/v2/pku/cls/announcement.js +++ b/lib/v2/pku/cls/announcement.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const homeUrl = 'https://bio.pku.edu.cn/homes/Index/news/21/21.html'; @@ -9,7 +9,7 @@ const baseUrl = 'https://bio.pku.edu.cn'; module.exports = async (ctx) => { const response = await got(homeUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('div.normal_list>ul a') .toArray() @@ -26,7 +26,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const { data: response } = await got(item.link); - const $ = cheerio.load(response); + const $ = load(response); item.description = $('div.page div.common_width div.col-md-9').first().html(); return item; @@ -34,9 +34,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '北京大学生命科学学院通知公告', link: homeUrl, item: items, - }; + }); }; diff --git a/lib/v2/pku/cls/lecture.js b/lib/v2/pku/cls/lecture.js index a227226241..59d81501c0 100644 --- a/lib/v2/pku/cls/lecture.js +++ b/lib/v2/pku/cls/lecture.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const homeUrl = 'http://bio.pku.edu.cn/homes/Index/news_jz/7/7.html'; const baseUrl = 'http://bio.pku.edu.cn'; @@ -8,8 +8,8 @@ const baseUrl = 'http://bio.pku.edu.cn'; module.exports = async (ctx) => { const response = await got(homeUrl); - const $ = cheerio.load(response.data); - ctx.state.data = { + const $ = load(response.data); + ctx.set('data', { title: `北京大学生命科学学院近期讲座`, link: homeUrl, description: `北京大学生命科学学院近期讲座`, @@ -21,5 +21,5 @@ module.exports = async (ctx) => { link: baseUrl + $('a.clearfix').attr('href'), })) .get(), - }; + }); }; diff --git a/lib/v2/pku/eecs.js b/lib/v2/pku/eecs.js index 74082468f7..e4c8915e88 100644 --- a/lib/v2/pku/eecs.js +++ b/lib/v2/pku/eecs.js @@ -1,20 +1,20 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { eecsMap } = require('./utils'); module.exports = async (ctx) => { const host = 'https://eecs.pku.edu.cn'; - let type = ctx.params && Number.parseInt(ctx.params.type); + let type = ctx.params && Number.parseInt(ctx.req.param('type')); if (type === undefined) { type = 0; } const response = await got(host + '/xygk1/ggtz/' + eecsMap.get(type)); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.hvr-shutter-out-vertical') .toArray() .map((item) => { @@ -30,7 +30,7 @@ module.exports = async (ctx) => { items.map((item) => ctx.cache.tryGet(item.link, async () => { const detail = await got(item.link); - const content = cheerio.load(detail.data); + const content = load(detail.data); content('input').remove(); content('h1').remove(); @@ -55,10 +55,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: host + '/xygk1/ggtz/' + eecsMap.get(type), description: '北大信科 公告通知', item: items, - }; + }); }; diff --git a/lib/v2/pku/hr.js b/lib/v2/pku/hr.js index a2be6f5f4a..5e55728a00 100644 --- a/lib/v2/pku/hr.js +++ b/lib/v2/pku/hr.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const category = ctx.params.category?.replace(/-/g, '/') ?? 'zxgg'; + const category = ctx.req.param('category')?.replace(/-/g, '/') ?? 'zxgg'; const rootUrl = 'https://hr.pku.edu.cn/'; const currentUrl = `${rootUrl}/${category}/index.htm`; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.item-list li a') .map((_, item) => { @@ -34,7 +34,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); content('.title').remove(); @@ -46,9 +46,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${$('h2').text()} - ${$('title').text()}`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/pku/nsd.js b/lib/v2/pku/nsd.js index 30dfac8292..53e9aaa44e 100644 --- a/lib/v2/pku/nsd.js +++ b/lib/v2/pku/nsd.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { finishArticleItem } = require('@/utils/wechat-mp'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; const baseUrl = 'https://nsd.pku.edu.cn/sylm/gd/'; @@ -22,7 +22,7 @@ const pageType = (href) => { module.exports = async (ctx) => { const response = await got({ url: baseUrl, https: { rejectUnauthorized: false } }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('div.maincontent > ul > li') .map((_index, item) => { const href = $(item).find('a').attr('href'); @@ -44,14 +44,14 @@ module.exports = async (ctx) => { case 'pku-news': return ctx.cache.tryGet(item.link, async () => { const detailResponse = await got({ url: item.link, https: { rejectUnauthorized: false } }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('div.pageArticle > div.col.lf').html(); return item; }); case 'in-site': return ctx.cache.tryGet(item.link, async () => { const detailResponse = await got({ url: item.link, https: { rejectUnauthorized: false } }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('div.article').html(); return item; }); @@ -61,9 +61,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '观点 - 北京大学国家发展研究院', link: baseUrl, item: items, - }; + }); }; diff --git a/lib/v2/pku/pkuyjs.js b/lib/v2/pku/pkuyjs.js index 2454463142..0da532df2e 100644 --- a/lib/v2/pku/pkuyjs.js +++ b/lib/v2/pku/pkuyjs.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const link = 'https://admission.pku.edu.cn/zsxx/sszs/index.htm'; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.zsxx_cont_list li'); - ctx.state.data = { + ctx.set('data', { title: `${$('.twostage_title_C').text()} - ${$('title').text()}`, link, description: '北京大学研究生院通知公告', @@ -25,5 +25,5 @@ module.exports = async (ctx) => { }; }) .get(), - }; + }); }; diff --git a/lib/v2/pku/rccp/mzyt.js b/lib/v2/pku/rccp/mzyt.js index 9d815a32ca..894a582c31 100644 --- a/lib/v2/pku/rccp/mzyt.js +++ b/lib/v2/pku/rccp/mzyt.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseUrl = 'https://www.rccp.pku.edu.cn/mzyt/'; module.exports = async (ctx) => { const response = await got(baseUrl); - const $ = cheerio.load(response.data); - ctx.state.data = { + const $ = load(response.data); + ctx.set('data', { title: '每周一推 - 北京大学中国政治学研究中心', link: baseUrl, description: $('meta[name="description"]').attr('content'), @@ -19,5 +19,5 @@ module.exports = async (ctx) => { link: baseUrl + $(item).find('a').attr('href'), })) .get(), - }; + }); }; diff --git a/lib/v2/pku/scc/recruit.js b/lib/v2/pku/scc/recruit.js index 5a8b5533e8..bbe7305d53 100644 --- a/lib/v2/pku/scc/recruit.js +++ b/lib/v2/pku/scc/recruit.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const arr = { xwrd: 'home!newsHome.action?category=12', @@ -13,11 +13,11 @@ const arr = { const baseUrl = 'https://scc.pku.edu.cn/'; module.exports = async (ctx) => { - const type = ctx.params.type ?? 'zpxx'; + const type = ctx.req.param('type') ?? 'zpxx'; const rootUrl = baseUrl + arr[type]; const list_response = await got(rootUrl); - const $ = cheerio.load(list_response.data); + const $ = load(list_response.data); const feed_title = $('h2.category').text(); @@ -36,14 +36,14 @@ module.exports = async (ctx) => { const sorted = list.sort((a, b) => b.pubDate.getTime() - a.pubDate.getTime()).slice(0, 10); - ctx.state.data = { + ctx.set('data', { title: `北京大学学生就业指导服务中心 - ${feed_title}`, link: rootUrl, item: await Promise.all( sorted.map((item) => ctx.cache.tryGet(item.link, async () => { const detail_page = await got(item.link); - const detail = cheerio.load(detail_page.data); + const detail = load(detail_page.data); const script = detail('script', 'div#content-div').html(); if (script !== null) { const content_route = script.match(/\$\("#content-div"\).load\("(\S+)"\)/)[1]; @@ -54,5 +54,5 @@ module.exports = async (ctx) => { }) ) ), - }; + }); }; diff --git a/lib/v2/pku/ss/admission.js b/lib/v2/pku/ss/admission.js index b7cd0572ce..77ef87cc84 100644 --- a/lib/v2/pku/ss/admission.js +++ b/lib/v2/pku/ss/admission.js @@ -6,10 +6,10 @@ module.exports = async (ctx) => { const items = await getSingleRecord(host); const out = await Promise.all(items.map((item) => getArticle(item, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: '北大软微-招生通知', description: '北京大学软件与微电子学院 - 招生通知', link: host, item: out, - }; + }); }; diff --git a/lib/v2/pku/ss/common.js b/lib/v2/pku/ss/common.js index d518c79654..a9354eb4d1 100644 --- a/lib/v2/pku/ss/common.js +++ b/lib/v2/pku/ss/common.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseUrl = 'https://www.ss.pku.edu.cn'; const getSingleRecord = async (url) => { const res = await got(url); - const $ = cheerio.load(res.data); + const $ = load(res.data); const list = $('#info-list-ul').find('li'); return list.toArray().map((item) => { @@ -24,7 +24,7 @@ const getSingleRecord = async (url) => { const getArticle = (item, tryGet) => tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.description = $('.article-content').html(); return item; diff --git a/lib/v2/pku/ss/notice.js b/lib/v2/pku/ss/notice.js index 71dfeb058f..261ee28def 100644 --- a/lib/v2/pku/ss/notice.js +++ b/lib/v2/pku/ss/notice.js @@ -6,10 +6,10 @@ module.exports = async (ctx) => { const items = await getSingleRecord(host); const out = await Promise.all(items.map((item) => getArticle(item, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: '北大软微-通知公告', description: '北京大学软件与微电子学院 - 通知公告', link: host, item: out, - }; + }); }; diff --git a/lib/v2/pku/ss/pg-admin.js b/lib/v2/pku/ss/pg-admin.js index 2c7fdd801f..f4d32f16ca 100644 --- a/lib/v2/pku/ss/pg-admin.js +++ b/lib/v2/pku/ss/pg-admin.js @@ -6,10 +6,10 @@ module.exports = async (ctx) => { const items = await getSingleRecord(host); const out = await Promise.all(items.map((item) => getArticle(item, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: '北大软微-硕士统考招生', description: '北京大学软件与微电子学院 - 硕士统考招生通知', link: host, item: out, - }; + }); }; diff --git a/lib/v2/playno1/av.js b/lib/v2/playno1/av.js index b8331c9953..7d5ac4b8d0 100644 --- a/lib/v2/playno1/av.js +++ b/lib/v2/playno1/av.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { cookieJar, processArticle } = require('./utils'); const baseUrl = 'http://www.playno1.com'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { const response = await got(url, { cookieJar, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.fire_float') .toArray() @@ -32,10 +32,10 @@ module.exports = async (ctx) => { items = await processArticle(items, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link: url, item: items, language: 'zh-TW', - }; + }); }; diff --git a/lib/v2/playno1/st.js b/lib/v2/playno1/st.js index 3e9df5126f..97ccedc00b 100644 --- a/lib/v2/playno1/st.js +++ b/lib/v2/playno1/st.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { cookieJar, processArticle } = require('./utils'); const baseUrl = 'http://stno1.playno1.com'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { const response = await got(url, { cookieJar, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.fallsBox') .toArray() @@ -27,10 +27,10 @@ module.exports = async (ctx) => { items = await processArticle(items, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link: url, item: items, language: 'zh-TW', - }; + }); }; diff --git a/lib/v2/playno1/utils.js b/lib/v2/playno1/utils.js index 18c0de2b97..5839d80f7e 100644 --- a/lib/v2/playno1/utils.js +++ b/lib/v2/playno1/utils.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { CookieJar, Cookie } = require('tough-cookie'); const cookieJar = new CookieJar(); const cookie = Cookie.fromJSON({ @@ -19,7 +19,7 @@ const processArticle = (items, cache) => const detailResponse = await got(item.link, { cookieJar, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('#article_content').html(); return item; }) diff --git a/lib/v2/playpcesor/rss.js b/lib/v2/playpcesor/rss.js index 6e37e0e422..d6a7e1de20 100644 --- a/lib/v2/playpcesor/rss.js +++ b/lib/v2/playpcesor/rss.js @@ -1,11 +1,11 @@ -const { parseDate } = require('@/utils/parse-date'); -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import { parseDate } from '@/utils/parse-date'; +import got from '@/utils/got'; +import { load } from 'cheerio'; module.exports = async (ctx) => { const url = 'https://www.playpcesor.com/'; const response = await got({ method: 'get', url }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $("article[class='post-outer-container']") .map((i, e) => { @@ -24,9 +24,9 @@ module.exports = async (ctx) => { }) .get(); - ctx.state.data = { + ctx.set('data', { title: '电脑玩物', link: url, item: list, - }; + }); }; diff --git a/lib/v2/plurk/anonymous.js b/lib/v2/plurk/anonymous.js index bebf728d3a..7fdbc45dca 100644 --- a/lib/v2/plurk/anonymous.js +++ b/lib/v2/plurk/anonymous.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { baseUrl, getPlurk } = require('./utils'); module.exports = async (ctx) => { const { data: apiResponse } = await got(`${baseUrl}/Stats/getAnonymousPlurks`, { searchParams: { offset: 0, - limit: ctx.query.limit ? Number(ctx.query.limit) : 200, + limit: ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 200, }, }); @@ -14,10 +14,10 @@ module.exports = async (ctx) => { const items = await Promise.all(Object.values(apiResponse).map((item) => getPlurk(`plurk:${item.plurk_id}`, item, 'ಠ_ಠ', ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: 'Anonymous - Plurk', image: 'https://s.plurk.com/2c1574c02566f3b06e91.png', link: `${baseUrl}/anonymous`, item: items, - }; + }); }; diff --git a/lib/v2/plurk/hotlinks.js b/lib/v2/plurk/hotlinks.js index 1ae48cc339..292a1f31bd 100644 --- a/lib/v2/plurk/hotlinks.js +++ b/lib/v2/plurk/hotlinks.js @@ -1,20 +1,20 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { baseUrl, getPlurk } = require('./utils'); module.exports = async (ctx) => { const { data: apiResponse } = await got(`${baseUrl}/hotlinks/getLinks`, { searchParams: { offset: 0, - count: ctx.query.limit ? Number(ctx.query.limit) : 30, + count: ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 30, }, }); const items = await Promise.all(apiResponse.map((item) => getPlurk(item.link_url.startsWith('https://www.plurk.com/p/') ? item.link_url : `plurk:${item.link_url}`, item, null, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: `Hot Links - Plurk`, image: 'https://s.plurk.com/2c1574c02566f3b06e91.png', link: `${baseUrl}/hotlinks`, item: items, - }; + }); }; diff --git a/lib/v2/plurk/news.js b/lib/v2/plurk/news.js index f7a1636342..0242011261 100644 --- a/lib/v2/plurk/news.js +++ b/lib/v2/plurk/news.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { baseUrl, fetchFriends, getPlurk } = require('./utils'); module.exports = async (ctx) => { @@ -14,10 +14,10 @@ module.exports = async (ctx) => { const items = await Promise.all(apiResponse.map((item) => getPlurk(`plurk:${item.plurk_id}`, item, names[item.user_id].display_name, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: 'Plurk News - Plurk', image: 'https://s.plurk.com/2c1574c02566f3b06e91.png', link: `${baseUrl}/news`, item: items, - }; + }); }; diff --git a/lib/v2/plurk/search.js b/lib/v2/plurk/search.js index 5173d04f10..3749596a30 100644 --- a/lib/v2/plurk/search.js +++ b/lib/v2/plurk/search.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const dayjs = require('dayjs'); const { baseUrl, getPlurk } = require('./utils'); @@ -17,11 +17,11 @@ module.exports = async (ctx) => { const items = await Promise.all(plurks.map((item) => getPlurk(`plurk:${item.plurk_id}`, item, users[item.user_id].display_name, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: `Search "${keyword}" - Plurk`, description: 'Search messages on Plurk', image: 'https://s.plurk.com/e8266f512246cdbc2721.jpg', link: `${baseUrl}/search?q=${encodeURIComponent(keyword)}`, item: items, - }; + }); }; diff --git a/lib/v2/plurk/top.js b/lib/v2/plurk/top.js index 4b1639c1a9..0732ac2704 100644 --- a/lib/v2/plurk/top.js +++ b/lib/v2/plurk/top.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { baseUrl, getPlurk } = require('./utils'); const categoryList = new Set(['topReplurks', 'topFavorites', 'topResponded']); @@ -13,17 +13,17 @@ module.exports = async (ctx) => { searchParams: { period: 'day', lang, - limit: ctx.query.limit ? Number(ctx.query.limit) : 90, + limit: ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 90, }, }); const items = await Promise.all(apiResponse.stats.map((item) => item[1]).map((item) => getPlurk(`plurk:${item.plurk_id}`, item, item.owner.display_name, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: 'Top Plurk - Plurk', image: 'https://s.plurk.com/2c1574c02566f3b06e91.png', link: `${baseUrl}/top#${category}`, item: items, language: lang, - }; + }); }; diff --git a/lib/v2/plurk/topic.js b/lib/v2/plurk/topic.js index 67c4d0b44e..3d7326777b 100644 --- a/lib/v2/plurk/topic.js +++ b/lib/v2/plurk/topic.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { baseUrl, fetchFriends, getPlurk } = require('./utils'); module.exports = async (ctx) => { @@ -9,11 +9,11 @@ module.exports = async (ctx) => { searchParams: { topic, offset: 0, - limit: ctx.query.limit ? Number(ctx.query.limit) : 30, + limit: ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 30, }, }); - const $ = cheerio.load(pageResponse); + const $ = load(pageResponse); delete apiResponse.pids; delete apiResponse.count; @@ -23,11 +23,11 @@ module.exports = async (ctx) => { const items = await Promise.all(Object.values(apiResponse).map((item) => getPlurk(`plurk:${item.plurk_id}`, item, names[item.user_id].display_name, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), description: $('meta[property=og:description]').attr('content'), image: $('meta[property=og:image]').attr('content') || $('meta[name=msapplication-TileImage]').attr('content'), link: `${baseUrl}/topic/${topic}`, item: items, - }; + }); }; diff --git a/lib/v2/plurk/user.js b/lib/v2/plurk/user.js index 35136fbc77..7d2ca876fa 100644 --- a/lib/v2/plurk/user.js +++ b/lib/v2/plurk/user.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { baseUrl, fetchFriends, getPlurk } = require('./utils'); module.exports = async (ctx) => { const { user } = ctx.params; const { data: pageResponse } = await got(`${baseUrl}/${user}`); - const $ = cheerio.load(pageResponse); + const $ = load(pageResponse); const publicPlurks = JSON.parse( $('body script[type]') @@ -21,11 +21,11 @@ module.exports = async (ctx) => { const items = await Promise.all(publicPlurks.map((item) => getPlurk(`plurk:${item.plurk_id}`, item, names[item.user_id].display_name, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), description: $('meta[property=og:description]').attr('content'), image: $('meta[property=og:image]').attr('content') || $('meta[name=msapplication-TileImage]').attr('content'), link: `${baseUrl}/${user}`, item: items, - }; + }); }; diff --git a/lib/v2/plurk/utils.js b/lib/v2/plurk/utils.js index d436bd2b1f..3fb2ef39f1 100644 --- a/lib/v2/plurk/utils.js +++ b/lib/v2/plurk/utils.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseUrl = 'https://www.plurk.com'; @@ -29,7 +29,7 @@ const fetchFriends = async (userIds) => { */ const getPlurk = (plurkGuid, item, author, tryGet) => tryGet(plurkGuid, () => { - const $ = cheerio.load(item.content || item.rendered, null, false); + const $ = load(item.content || item.rendered, null, false); $('img').each((_, e) => { e = $(e); e.removeAttr('height').removeAttr('width'); diff --git a/lib/v2/pnas/index.js b/lib/v2/pnas/index.js index 366e2753c6..3d01ce6395 100644 --- a/lib/v2/pnas/index.js +++ b/lib/v2/pnas/index.js @@ -1,11 +1,12 @@ -const cheerio = require('cheerio'); -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import { load } from 'cheerio'; +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const { setCookies } = require('@/utils/puppeteer-utils'); const { CookieJar } = require('tough-cookie'); const logger = require('@/utils/logger'); +import puppeteer from '@/utils/puppeteer'; module.exports = async (ctx) => { const baseUrl = 'https://www.pnas.org'; @@ -22,7 +23,7 @@ module.exports = async (ctx) => { await ctx.cache.set('pnas:cookieJar', cookieJar.toJSON()); } - const $ = cheerio.load(res); + const $ = load(res); const list = $('.card--row-reversed .card-content') .toArray() .map((item) => { @@ -35,7 +36,7 @@ module.exports = async (ctx) => { }; }); - const browser = await require('@/utils/puppeteer')(); + const browser = puppeteer(); const out = await Promise.all( list.map((item) => @@ -56,7 +57,7 @@ module.exports = async (ctx) => { const res = await page.evaluate(() => document.documentElement.innerHTML); await page.close(); - const $ = cheerio.load(res); + const $ = load(res); const PNASdataLayer = JSON.parse( $('script') .text() @@ -90,12 +91,12 @@ module.exports = async (ctx) => { browser.close(); - ctx.state.data = { + ctx.set('data', { title: `${$('.banner-widget__content h1').text()} - PNAS`, description: $('.banner-widget__content p').text(), image: 'https://www.pnas.org/favicon.ico', language: 'en-US', link, item: out, - }; + }); }; diff --git a/lib/v2/pornhub/category-url.js b/lib/v2/pornhub/category-url.js index 8640648fd3..7e97325b8d 100644 --- a/lib/v2/pornhub/category-url.js +++ b/lib/v2/pornhub/category-url.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { isValidHost } = require('@/utils/valid-host'); const { headers, parseItems } = require('./utils'); @@ -11,15 +11,15 @@ module.exports = async (ctx) => { } const { data: response } = await got(link, { headers }); - const $ = cheerio.load(response); + const $ = load(response); const items = $('#videoCategory .videoBox') .toArray() .map((e) => parseItems($(e))); - ctx.state.data = { + ctx.set('data', { title: $('title').first().text(), link, language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/pornhub/category.js b/lib/v2/pornhub/category.js index bdad4f120d..0358fcc7c7 100644 --- a/lib/v2/pornhub/category.js +++ b/lib/v2/pornhub/category.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const { defaultDomain, renderDescription } = require('./utils'); -const config = require('@/config').value; +import { config } from '@/config'; module.exports = async (ctx) => { - const category = ctx.params.caty; + const category = ctx.req.param('caty'); const categories = await ctx.cache.tryGet('pornhub:categories', async () => { const { data } = await got(`${defaultDomain}/webmasters/categories`); @@ -36,9 +36,9 @@ module.exports = async (ctx) => { category: [...new Set([...item.tags.map((t) => t.tag_name), ...item.categories.map((c) => c.category)])], })); - ctx.state.data = { + ctx.set('data', { title: `Pornhub - ${categoryName}`, link: `${defaultDomain}/video?c=${categoryId}`, item: list, - }; + }); }; diff --git a/lib/v2/pornhub/model.js b/lib/v2/pornhub/model.js index 349e4f84ce..36751eb66f 100644 --- a/lib/v2/pornhub/model.js +++ b/lib/v2/pornhub/model.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { isValidHost } = require('@/utils/valid-host'); const { headers, parseItems } = require('./utils'); @@ -11,12 +11,12 @@ module.exports = async (ctx) => { } const { data: response } = await got(link, { headers }); - const $ = cheerio.load(response); + const $ = load(response); const items = $('#mostRecentVideosSection .videoBox') .toArray() .map((e) => parseItems($(e))); - ctx.state.data = { + ctx.set('data', { title: $('title').first().text(), description: $('section.aboutMeSection').text().trim(), link, @@ -25,5 +25,5 @@ module.exports = async (ctx) => { icon: $('#getAvatar').attr('src'), language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/pornhub/pornstar.js b/lib/v2/pornhub/pornstar.js index 98fc1bf84b..9fb3170d5c 100644 --- a/lib/v2/pornhub/pornstar.js +++ b/lib/v2/pornhub/pornstar.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { isValidHost } = require('@/utils/valid-host'); const { headers, parseItems } = require('./utils'); @@ -11,12 +11,12 @@ module.exports = async (ctx) => { } const { data: response } = await got(link, { headers }); - const $ = cheerio.load(response); + const $ = load(response); const items = $('#mostRecentVideosSection .videoBox') .toArray() .map((e) => parseItems($(e))); - ctx.state.data = { + ctx.set('data', { title: $('title').first().text(), description: $('section.aboutMeSection').text().trim(), link, @@ -25,5 +25,5 @@ module.exports = async (ctx) => { icon: $('#getAvatar').attr('src'), language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/pornhub/search.js b/lib/v2/pornhub/search.js index 6aaa5d7d4b..5d586e90e7 100644 --- a/lib/v2/pornhub/search.js +++ b/lib/v2/pornhub/search.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const { defaultDomain, renderDescription } = require('./utils'); module.exports = async (ctx) => { @@ -15,9 +15,9 @@ module.exports = async (ctx) => { category: [...new Set([...item.tags.map((t) => t.tag_name), ...item.categories.map((c) => c.category)])], })); - ctx.state.data = { + ctx.set('data', { title: `Pornhub - ${keyword}`, link: currentUrl, item: list, - }; + }); }; diff --git a/lib/v2/pornhub/users.js b/lib/v2/pornhub/users.js index aff830af15..2aa2d11e2f 100644 --- a/lib/v2/pornhub/users.js +++ b/lib/v2/pornhub/users.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { isValidHost } = require('@/utils/valid-host'); const { headers, parseItems } = require('./utils'); @@ -11,12 +11,12 @@ module.exports = async (ctx) => { } const { data: response } = await got(link, { headers }); - const $ = cheerio.load(response); + const $ = load(response); const items = $('.videoUList .videoBox') .toArray() .map((e) => parseItems($(e))); - ctx.state.data = { + ctx.set('data', { title: $('title').first().text(), description: $('.aboutMeText').text().trim(), link, @@ -26,5 +26,5 @@ module.exports = async (ctx) => { language: $('html').attr('lang'), allowEmpty: true, item: items, - }; + }); }; diff --git a/lib/v2/pornhub/utils.js b/lib/v2/pornhub/utils.js index 1996ccad0e..a7944aefd4 100644 --- a/lib/v2/pornhub/utils.js +++ b/lib/v2/pornhub/utils.js @@ -1,6 +1,6 @@ -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); -const { parseRelativeDate } = require('@/utils/parse-date'); +import { parseRelativeDate } from '@/utils/parse-date'; const dayjs = require('dayjs'); const defaultDomain = 'https://www.pornhub.com'; diff --git a/lib/v2/postman/release-notes.js b/lib/v2/postman/release-notes.js index 8061f82faa..2f07446256 100644 --- a/lib/v2/postman/release-notes.js +++ b/lib/v2/postman/release-notes.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const md = require('markdown-it')({ html: true, }); @@ -19,9 +19,9 @@ module.exports = async (ctx) => { description: md.render(item.content), })); - ctx.state.data = { + ctx.set('data', { title: 'Release Notes | Postman', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/producthunt/today.js b/lib/v2/producthunt/today.js index ca1e845052..8ae1527e63 100644 --- a/lib/v2/producthunt/today.js +++ b/lib/v2/producthunt/today.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { const response = await got('https://www.producthunt.com/'); - const data = JSON.parse(cheerio.load(response.data)('#__NEXT_DATA__').html()); + const data = JSON.parse(load(response.data)('#__NEXT_DATA__').html()); const list = Object.values(data.props.apolloState) .filter((o) => o.__typename === 'Post') @@ -19,7 +19,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(item.slug, async () => { const detailresponse = await got(`https://www.producthunt.com/posts/${item.slug}`); - const data = JSON.parse(cheerio.load(detailresponse.data)('#__NEXT_DATA__').html()); + const data = JSON.parse(load(detailresponse.data)('#__NEXT_DATA__').html()); const descData = data.props.apolloState[`Post${item.id}`]; return { @@ -36,9 +36,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'Product Hunt Today Popular', link: 'https://www.producthunt.com/', item: items, - }; + }); }; diff --git a/lib/v2/ps/monthly-games.js b/lib/v2/ps/monthly-games.js index 978a79c8a6..8b48490688 100644 --- a/lib/v2/ps/monthly-games.js +++ b/lib/v2/ps/monthly-games.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const path = require('path'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; module.exports = async (ctx) => { const baseUrl = 'https://www.playstation.com/en-sg/ps-plus/whats-new/'; const { data: response } = await got(baseUrl); - const $ = cheerio.load(response); + const $ = load(response); const list = $('.cmp-experiencefragment--your-latest-monthly-games .box') .toArray() @@ -23,9 +23,9 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: 'PlayStation Plus Monthly Games', link: baseUrl, item: list, - }; + }); }; diff --git a/lib/v2/ps/trophy.js b/lib/v2/ps/trophy.js index 78f75a163e..28df49fc4e 100644 --- a/lib/v2/ps/trophy.js +++ b/lib/v2/ps/trophy.js @@ -1,15 +1,15 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const response = await got({ method: 'get', url: `https://psnprofiles.com/${id}?order=last-trophy`, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.zebra tr') .filter(function () { return $(this).find('.progress-bar span').text() !== '0%'; @@ -27,7 +27,7 @@ module.exports = async (ctx) => { url: link, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.zebra tr.completed'); const items = list @@ -78,9 +78,9 @@ module.exports = async (ctx) => { } result = result.sort((a, b) => new Date(b.pubDate) - new Date(a.pubDate)); - ctx.state.data = { + ctx.set('data', { title: `${id} 的 PSN 奖杯`, link: `https://psnprofiles.com/${id}/log`, item: result, - }; + }); }; diff --git a/lib/v2/pts/curations.js b/lib/v2/pts/curations.js index c48cc3fcab..fdb468e3a2 100644 --- a/lib/v2/pts/curations.js +++ b/lib/v2/pts/curations.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -13,7 +13,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const items = $('.project-intro') .last() @@ -34,11 +34,11 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('title') .text() .replace(/第\d+頁 ｜ /, ''), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/pts/index.js b/lib/v2/pts/index.js index 38b16a0e32..6f340c47c1 100644 --- a/lib/v2/pts/index.js +++ b/lib/v2/pts/index.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -14,10 +14,10 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('h2 a') - .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 30) + .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 30) .toArray() .map((item) => { item = $(item); @@ -36,7 +36,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.author = content('.reporter-container a') .toArray() @@ -58,11 +58,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title') .text() .replace(/第\d+頁 ｜ /, ''), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/pts/live.js b/lib/v2/pts/live.js index 0813872874..28e505d618 100644 --- a/lib/v2/pts/live.js +++ b/lib/v2/pts/live.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const rootUrl = 'https://news.pts.org.tw'; const currentUrl = `${rootUrl}/live/${id}`; @@ -16,7 +16,7 @@ module.exports = async (ctx) => { url: apiUrl, }); - let items = response.data.data.blogArticleList.slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 30).map((item) => ({ + let items = response.data.data.blogArticleList.slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 30).map((item) => ({ link: `${rootUrl}/live/api/liveblog/article?articleId=${item}&model=main`, })); @@ -41,9 +41,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `公視新聞網 PNN - ${response.data.data.title.replace(/【不斷更新】/, '')}`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/pts/projects.js b/lib/v2/pts/projects.js index 93198627d2..bfe3b6c087 100644 --- a/lib/v2/pts/projects.js +++ b/lib/v2/pts/projects.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -13,7 +13,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const items = $('h3 a') .toArray() @@ -34,11 +34,11 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('title') .text() .replace(/第\d+頁 ｜ /, ''), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/pubmed/trending.js b/lib/v2/pubmed/trending.js index adb0fae2e0..c5a66214d0 100644 --- a/lib/v2/pubmed/trending.js +++ b/lib/v2/pubmed/trending.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { - const filters = ctx.params.filters; + const filters = ctx.req.param('filters'); const rootUrl = 'https://pubmed.ncbi.nlm.nih.gov'; const currentUrl = `${rootUrl}/trending${filters ? `?filter=${filters.replaceAll(',', '&filter=')}` : ''}`; @@ -15,7 +15,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('a[data-article-id]') .toArray() @@ -36,7 +36,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.doi = content('meta[name="citation_doi"]').attr('content'); item.pubDate = parseDate(content('meta[name="citation_date"]').attr('content')); @@ -50,9 +50,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'Trending page - PubMed', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/pumc/mdadmission.js b/lib/v2/pumc/mdadmission.js index 5425a76661..c4c4dc3bad 100644 --- a/lib/v2/pumc/mdadmission.js +++ b/lib/v2/pumc/mdadmission.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 100; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 100; const rootUrl = 'https://mdadmission.pumc.edu.cn'; const currentUrl = `${rootUrl}/mdweb/site!noticeList?param.infoTypeId=&rows=${limit}&pages=1`; @@ -16,7 +16,7 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('div.media') .toArray() @@ -43,7 +43,7 @@ module.exports = async (ctx) => { }, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); content('h3').remove(); @@ -54,9 +54,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '北京协和医学院招生网 - 通知公告', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/putty/changes.js b/lib/v2/putty/changes.js index 393b9d2901..d47a97c8b0 100644 --- a/lib/v2/putty/changes.js +++ b/lib/v2/putty/changes.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const rootUrl = 'https://www.chiark.greenend.org.uk'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data.replaceAll('href="releases', 'class="version" href="releases')); + const $ = load(response.data.replaceAll('href="releases', 'class="version" href="releases')); const items = $('.version') .toArray() @@ -28,9 +28,9 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/pwc/sustainability.js b/lib/v2/pwc/sustainability.js index 0dd381c038..6c1bf2813f 100644 --- a/lib/v2/pwc/sustainability.js +++ b/lib/v2/pwc/sustainability.js @@ -1,13 +1,14 @@ -const cheerio = require('cheerio'); +import { load } from 'cheerio'; const logger = require('@/utils/logger'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; +import puppeteer from '@/utils/puppeteer'; module.exports = async (ctx) => { const baseUrl = 'https://www.strategyand.pwc.com/at/en/functions/sustainability-strategy/publications.html'; const feedLang = 'en'; const feedDescription = 'Sustainability Publications from PwC Strategy&'; - const browser = await require('@/utils/puppeteer')(); + const browser = puppeteer(); const page = await browser.newPage(); logger.http(`Requesting ${baseUrl}`); await page.setRequestInterception(true); @@ -20,7 +21,7 @@ module.exports = async (ctx) => { const response = await page.content(); page.close(); - const $ = cheerio.load(response); + const $ = load(response); const list = $('div#wrapper article') .toArray() @@ -48,11 +49,11 @@ module.exports = async (ctx) => { browser.close(); - ctx.state.data = { + ctx.set('data', { title: 'PwC Strategy& - Sustainability Publications', link: baseUrl, language: feedLang, description: feedDescription, item: items, - }; + }); }; diff --git a/lib/v2/qbitai/category.js b/lib/v2/qbitai/category.js index 291bd9b1ad..606b33792a 100644 --- a/lib/v2/qbitai/category.js +++ b/lib/v2/qbitai/category.js @@ -1,6 +1,6 @@ const parser = require('@/utils/rss-parser'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const { category } = ctx.params; @@ -16,12 +16,12 @@ module.exports = async (ctx) => { description: item['content:encoded'], })); - ctx.state.data = { + ctx.set('data', { // 源标题 title: `量子位-${category}`, // 源链接 link: `https://www.qbitai.com/category/${category}`, // 源文章 item: items, - }; + }); }; diff --git a/lib/v2/qbitai/tag.js b/lib/v2/qbitai/tag.js index cd0fc9e2e7..6eb5660173 100644 --- a/lib/v2/qbitai/tag.js +++ b/lib/v2/qbitai/tag.js @@ -1,6 +1,6 @@ const parser = require('@/utils/rss-parser'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const { tag } = ctx.params; @@ -16,12 +16,12 @@ module.exports = async (ctx) => { description: item['content:encoded'], })); - ctx.state.data = { + ctx.set('data', { // 源标题 title: `量子位-${tag}`, // 源链接 link: `https://www.qbitai.com/tag/${tag}`, // 源文章 item: items, - }; + }); }; diff --git a/lib/v2/qbittorrent/news.js b/lib/v2/qbittorrent/news.js index 5391adb2a4..9493abdb32 100644 --- a/lib/v2/qbittorrent/news.js +++ b/lib/v2/qbittorrent/news.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const config = require('@/config').value; +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { config } from '@/config'; module.exports = async (ctx) => { const baseUrl = 'https://www.qbittorrent.org'; @@ -20,7 +20,7 @@ module.exports = async (ctx) => { false ); - const $ = cheerio.load(response); + const $ = load(response); const item = $('.stretcher') .find('h3') @@ -45,15 +45,15 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: 'qBittorrent News', link: `${baseUrl}/news.php`, item, - }; + }); - ctx.state.json = { + ctx.set('json', { title: 'qBittorrent News', link: `${baseUrl}/news.php`, item, - }; + }); }; diff --git a/lib/v2/qdu/houqin.js b/lib/v2/qdu/houqin.js index 12bf0f03b0..b397e6ec21 100644 --- a/lib/v2/qdu/houqin.js +++ b/lib/v2/qdu/houqin.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const base = 'https://houqin.qdu.edu.cn/'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { url: `${base}index/tzgg.htm`, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.n_newslist').children(); const items = await Promise.all( list.map((i, item) => { @@ -23,7 +23,7 @@ module.exports = async (ctx) => { return ctx.cache.tryGet(itemUrl, async () => { let description = ''; const result = await got(itemUrl); - const $ = cheerio.load(result.data); + const $ = load(result.data); if ( $('.article_body') .find('div > h4') @@ -54,10 +54,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '青岛大学 - 后勤管理处通知', link: `${base}index/tzgg.htm`, description: '青岛大学 - 后勤管理处通知', item: items, - }; + }); }; diff --git a/lib/v2/qdu/jwc.js b/lib/v2/qdu/jwc.js index c199ebf3e6..5fb81c040a 100644 --- a/lib/v2/qdu/jwc.js +++ b/lib/v2/qdu/jwc.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const base = 'https://jwc.qdu.edu.cn/'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { url: `${base}jwtz.htm`, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.notice_item').children(); const items = await Promise.all( list.map((i, item) => { @@ -27,7 +27,7 @@ module.exports = async (ctx) => { description = itemTitle; } else { const result = await got(itemUrl); - const $ = cheerio.load(result.data); + const $ = load(result.data); description = $('title').text() === '系统提示' ? itemTitle // 内网限制访问内容，仅返回标题 @@ -43,10 +43,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '青岛大学 - 教务处通知', link: `${base}jwtz.htm`, description: '青岛大学 - 教务处通知', item: items, - }; + }); }; diff --git a/lib/v2/qianp/news.js b/lib/v2/qianp/news.js index 8ab55c8eea..134db2e608 100644 --- a/lib/v2/qianp/news.js +++ b/lib/v2/qianp/news.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { getTokenAndSecret } = require('./utils'); module.exports = async (ctx) => { @@ -15,7 +15,7 @@ module.exports = async (ctx) => { const { data: response } = await got(url, { headers, }); - const $ = cheerio.load(response); + const $ = load(response); const list = $('.newslist .infor') .toArray() @@ -34,7 +34,7 @@ module.exports = async (ctx) => { const { data: response } = await got(item.link, { headers, }); - const $ = cheerio.load(response); + const $ = load(response); item.category = [...new Set($('meta[name=keywords]').attr('content').split('，'))]; item.author = $('meta[name=author]').attr('content'); @@ -47,11 +47,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), description: $('meta[name="description"]').attr('content'), link: url, image: `${baseUrl}/favicon.ico`, item: items, - }; + }); }; diff --git a/lib/v2/qianp/utils.js b/lib/v2/qianp/utils.js index ab274f5cfd..0101fd22c0 100644 --- a/lib/v2/qianp/utils.js +++ b/lib/v2/qianp/utils.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const getTokenAndSecret = (tryGet) => tryGet('qianp:token', async () => { diff --git a/lib/v2/qianzhan/column.js b/lib/v2/qianzhan/column.js index 5655db8d63..82dc3d0ca8 100644 --- a/lib/v2/qianzhan/column.js +++ b/lib/v2/qianzhan/column.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { let rootUrl = 'https://www.qianzhan.com/analyst/'; @@ -18,14 +18,14 @@ module.exports = async (ctx) => { } const response = await got(rootUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const links = $('.ptb30.bb1e.clf .f22 a').map((_, item) => $(item).attr('href')); const items = await Promise.all( links.map((_, item) => ctx.cache.tryGet(item, async () => { const detailResponse = await got(item); - const $ = cheerio.load(detailResponse.data); + const $ = load(detailResponse.data); const description = $('#divArtBody').html(); const title = $('#h_title').text(); const pubDate = timezone(parseDate($('#pubtime_baidu').text().split('• ')[1], 'YYYY-MM-DD HH:mm:ss'), +8); @@ -42,9 +42,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `前瞻经济学人 - ${titles[type]}`, link: rootUrl, item: items, - }; + }); }; diff --git a/lib/v2/qianzhan/rank.js b/lib/v2/qianzhan/rank.js index cd5115952b..66dfb88723 100644 --- a/lib/v2/qianzhan/rank.js +++ b/lib/v2/qianzhan/rank.js @@ -1,21 +1,21 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { - const type = ctx.params.type === 'week' ? 1 : 2; + const type = ctx.req.param('type') === 'week' ? 1 : 2; const rootUrl = 'https://www.qianzhan.com/analyst/'; const response = await got(rootUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const links = $(`#div_hotlist ul[idx='${type}'] a`).map((_, item) => $(item).attr('href')); const items = await Promise.all( links.map((_, item) => ctx.cache.tryGet(item, async () => { const detailResponse = await got(item); - const $ = cheerio.load(detailResponse.data); + const $ = load(detailResponse.data); const description = $('#divArtBody').html(); const title = $('#h_title').text(); const pubDate = timezone(parseDate($('#pubtime_baidu').text().split('• ')[1], 'YYYY-MM-DD HH:mm:ss'), +8); @@ -32,9 +32,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `前瞻经济学人 - ${type === 1 ? '周排行' : '月排行'}`, link: rootUrl, item: items, - }; + }); }; diff --git a/lib/v2/qidian/author.js b/lib/v2/qidian/author.js index 8b515f0da2..6747f9815d 100644 --- a/lib/v2/qidian/author.js +++ b/lib/v2/qidian/author.js @@ -1,16 +1,16 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { parseDate, parseRelativeDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); -const timezone = require('@/utils/timezone'); +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const rootUrl = 'https://my.qidian.com'; const currentUrl = `${rootUrl}/author/${id}/`; const response = await got(currentUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const authorName = $('.header-msg h1').contents().first().text().trim(); const items = $('.author-work .author-item') .toArray() @@ -32,10 +32,10 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: `${authorName} - 起点中文网`, description: $('.header-msg-desc').text().trim(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/qidian/chapter.js b/lib/v2/qidian/chapter.js index ef23ba5760..02ebe0efe3 100644 --- a/lib/v2/qidian/chapter.js +++ b/lib/v2/qidian/chapter.js @@ -1,18 +1,18 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const response = await got(`https://m.qidian.com/book/${id}.html`); - const $ = cheerio.load(response.data); + const $ = load(response.data); const name = $('meta[property="og:title"]').attr('content'); const coverUrl = `https:${$('.detail__header-cover__img').attr('src')}`; const { data: catalog } = await got(`https://m.qidian.com/book/${id}/catalog/`); - const $c = cheerio.load(catalog); + const $c = load(catalog); const { pageContext } = JSON.parse($c('#vite-plugin-ssr_pageContext').text()); const chapterItem = pageContext.pageProps.pageData.vs @@ -23,11 +23,11 @@ module.exports = async (ctx) => { link: `https://vipreader.qidian.com/chapter/${id}/${c.id}`, })); - ctx.state.data = { + ctx.set('data', { title: `起点 ${name}`, link: `https://book.qidian.com/info/${id}`, description: $('#bookSummary content').text(), image: coverUrl, item: chapterItem, - }; + }); }; diff --git a/lib/v2/qidian/forum.js b/lib/v2/qidian/forum.js index 657debca71..e6662c6a1a 100644 --- a/lib/v2/qidian/forum.js +++ b/lib/v2/qidian/forum.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseRelativeDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseRelativeDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const url = `https://forum.qidian.com/NewForum/List.aspx?BookId=${id}`; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(forum_response.data); + const $ = load(forum_response.data); const name = $('.main-header>h1').text(); const cover_url = $('img.forum_book').attr('src'); const list = $('li.post-wrap>.post'); @@ -29,10 +29,10 @@ module.exports = async (ctx) => { }); } - ctx.state.data = { + ctx.set('data', { title: `起点 《${name}》讨论区`, link: url, image: cover_url, item: items, - }; + }); }; diff --git a/lib/v2/qidian/free-next.js b/lib/v2/qidian/free-next.js index 5643035c4c..5b4c9660cf 100644 --- a/lib/v2/qidian/free-next.js +++ b/lib/v2/qidian/free-next.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); let link, title; if (type === 'mm') { @@ -14,7 +14,7 @@ module.exports = async (ctx) => { } const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('div.other-rec-wrap li'); const out = list @@ -33,10 +33,10 @@ module.exports = async (ctx) => { }) .get(); - ctx.state.data = { + ctx.set('data', { title, description: `限时免费下期预告-${title}`, link, item: out, - }; + }); }; diff --git a/lib/v2/qidian/free.js b/lib/v2/qidian/free.js index 7abeeb485c..2e93a8c1e8 100644 --- a/lib/v2/qidian/free.js +++ b/lib/v2/qidian/free.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseRelativeDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseRelativeDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); let link, title; if (type === 'mm') { @@ -15,7 +15,7 @@ module.exports = async (ctx) => { } const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('#limit-list li'); const out = list @@ -36,10 +36,10 @@ module.exports = async (ctx) => { }) .get(); - ctx.state.data = { + ctx.set('data', { title, description: `限时免费-${title}`, link, item: out, - }; + }); }; diff --git a/lib/v2/qingting/channel.js b/lib/v2/qingting/channel.js index d7d48962b4..5220566153 100644 --- a/lib/v2/qingting/channel.js +++ b/lib/v2/qingting/channel.js @@ -1,23 +1,23 @@ -const got = require('@/utils/got'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const channelUrl = `https://i.qingting.fm/capi/v3/channel/${ctx.params.id}`; + const channelUrl = `https://i.qingting.fm/capi/v3/channel/${ctx.req.param('id')}`; let response = await got(channelUrl); const title = response.data.data.title; - const programUrl = `https://i.qingting.fm/capi/channel/${ctx.params.id}/programs/${response.data.data.v}?curpage=1&pagesize=10&order=asc`; + const programUrl = `https://i.qingting.fm/capi/channel/${ctx.req.param('id')}/programs/${response.data.data.v}?curpage=1&pagesize=10&order=asc`; response = await got(programUrl); const items = response.data.data.programs.map((item) => ({ title: item.title, - link: `https://www.qingting.fm/channels/${ctx.params.id}/programs/${item.id}/`, + link: `https://www.qingting.fm/channels/${ctx.req.param('id')}/programs/${item.id}/`, pubDate: timezone(parseDate(item.update_time), +8), })); - ctx.state.data = { + ctx.set('data', { title: `${title} - 蜻蜓FM`, - link: `https://www.qingting.fm/channels/${ctx.params.id}`, + link: `https://www.qingting.fm/channels/${ctx.req.param('id')}`, item: await Promise.all( items.map((item) => ctx.cache.tryGet(item.link, async () => { @@ -28,5 +28,5 @@ module.exports = async (ctx) => { }) ) ), - }; + }); }; diff --git a/lib/v2/qingting/podcast.js b/lib/v2/qingting/podcast.js index 7d148a6d47..0e53e344ca 100644 --- a/lib/v2/qingting/podcast.js +++ b/lib/v2/qingting/podcast.js @@ -1,10 +1,10 @@ const crypto = require('crypto'); -const got = require('@/utils/got'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const channelUrl = `https://i.qingting.fm/capi/v3/channel/${ctx.params.id}`; + const channelUrl = `https://i.qingting.fm/capi/v3/channel/${ctx.req.param('id')}`; let response = await got({ method: 'get', url: channelUrl, @@ -16,7 +16,7 @@ module.exports = async (ctx) => { const channel_img = response.data.data.thumbs['400_thumb']; const authors = response.data.data.podcasters.map((author) => author.nick_name).join(','); const desc = response.data.data.description; - const programUrl = `https://i.qingting.fm/capi/channel/${ctx.params.id}/programs/${response.data.data.v}?curpage=1&pagesize=10&order=asc`; + const programUrl = `https://i.qingting.fm/capi/channel/${ctx.req.param('id')}/programs/${response.data.data.v}?curpage=1&pagesize=10&order=asc`; response = await got({ method: 'get', url: programUrl, @@ -27,10 +27,10 @@ module.exports = async (ctx) => { const resultItems = await Promise.all( response.data.data.programs.map((item) => - ctx.cache.tryGet(`qingting:podcast:${ctx.params.id}:${item.id}`, async () => { - const link = `https://www.qingting.fm/channels/${ctx.params.id}/programs/${item.id}/`; + ctx.cache.tryGet(`qingting:podcast:${ctx.req.param('id')}:${item.id}`, async () => { + const link = `https://www.qingting.fm/channels/${ctx.req.param('id')}/programs/${item.id}/`; - const path = `/audiostream/redirect/${ctx.params.id}/${item.id}?access_token=&device_id=MOBILESITE&qingting_id=&t=${Date.now()}`; + const path = `/audiostream/redirect/${ctx.req.param('id')}/${item.id}?access_token=&device_id=MOBILESITE&qingting_id=&t=${Date.now()}`; const sign = crypto.createHmac('md5', 'fpMn12&38f_2e').update(path).digest('hex').toString(); const [detailRes, mediaRes] = await Promise.all([ @@ -66,12 +66,12 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${title} - 蜻蜓FM`, description: desc, itunes_author: authors, image: channel_img, - link: `https://www.qingting.fm/channels/${ctx.params.id}`, + link: `https://www.qingting.fm/channels/${ctx.req.param('id')}`, item: resultItems, - }; + }); }; diff --git a/lib/v2/qipamaijia/index.js b/lib/v2/qipamaijia/index.js index f58b56c8d8..23787e85c6 100644 --- a/lib/v2/qipamaijia/index.js +++ b/lib/v2/qipamaijia/index.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const rootUrl = 'https://www.qipamaijia.com'; module.exports = async (ctx) => { - const cate = ctx.params.cate ?? ''; + const cate = ctx.req.param('cate') ?? ''; const url = `${rootUrl}/${cate}`; const response = await got({ @@ -14,7 +14,7 @@ module.exports = async (ctx) => { rejectUnauthorized: false, }, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const title = $('#highlight').text(); const items = $('div.col_l > div.block') .map((_index, item) => ({ @@ -24,9 +24,9 @@ module.exports = async (ctx) => { })) .get(); - ctx.state.data = { + ctx.set('data', { title: `奇葩买家秀 - ${title}`, link: url, item: items, - }; + }); }; diff --git a/lib/v2/qiyoujiage/price.js b/lib/v2/qiyoujiage/price.js index b2926700f0..54bf80fc7f 100644 --- a/lib/v2/qiyoujiage/price.js +++ b/lib/v2/qiyoujiage/price.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const md5 = require('@/utils/md5'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import md5 from '@/utils/md5'; module.exports = async (ctx) => { const { path } = ctx.params; const link = `http://www.qiyoujiage.com/${path}.shtml`; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const priceText = $('#youjia').text(); const item = [ @@ -19,10 +19,10 @@ module.exports = async (ctx) => { }, ]; - ctx.state.data = { + ctx.set('data', { title: $('title').text(), description: $('meta[name="Description"]').attr('content'), link, item, - }; + }); }; diff --git a/lib/v2/qlu/notice.js b/lib/v2/qlu/notice.js index 648c3f4955..ba47ea798a 100644 --- a/lib/v2/qlu/notice.js +++ b/lib/v2/qlu/notice.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const host = 'https://www.qlu.edu.cn'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { url: `${host}/tzggsh/list1.htm`, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('ul.news_list.list2').children(); const items = await Promise.all( @@ -27,7 +27,7 @@ module.exports = async (ctx) => { description = itemTitle; } else { const result = await got(itemUrl); - const $ = cheerio.load(result.data); + const $ = load(result.data); description = $('.read').html().trim(); } return { @@ -40,10 +40,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: `齐鲁工业大学 - 通知公告`, link: `${host}/tzggsh/list1.htm`, description: '齐鲁工业大学 - 通知公告', item: items, - }; + }); }; diff --git a/lib/v2/qm120/news.js b/lib/v2/qm120/news.js index 492d8b06c3..fbce6e1232 100644 --- a/lib/v2/qm120/news.js +++ b/lib/v2/qm120/news.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const category = ctx.params.category ?? 'jdxw'; + const category = ctx.req.param('category') ?? 'jdxw'; const rootUrl = 'http://www.qm120.com'; const currentUrl = `${rootUrl}/news/${category}`; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.lb2boxls ul li a') .toArray() @@ -32,7 +32,7 @@ module.exports = async (ctx) => { method: 'get', url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('.neirong_body').html(); item.pubDate = timezone(parseDate(content('.neirong_head p span').eq(1).text()), +8); @@ -42,9 +42,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${$('.zt_liebiao_tit').text()} - 全民健康网`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/apps/card.js b/lib/v2/qoo-app/apps/card.js index 30809e1078..f03ef64839 100644 --- a/lib/v2/qoo-app/apps/card.js +++ b/lib/v2/qoo-app/apps/card.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { appsUrl } = require('../utils'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const link = `${appsUrl}${lang ? `/${lang}` : ''}/app-card/${id}`; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const items = $('.qoo-post-item') .toArray() @@ -29,10 +29,10 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/apps/comment.js b/lib/v2/qoo-app/apps/comment.js index 78fa1afe6c..b0a851e5b6 100644 --- a/lib/v2/qoo-app/apps/comment.js +++ b/lib/v2/qoo-app/apps/comment.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { appsUrl } = require('../utils'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -15,7 +15,7 @@ module.exports = async (ctx) => { sort: 'create', }, }); - const $ = cheerio.load(response); + const $ = load(response); const items = $('.qoo-post-item') .toArray() @@ -34,10 +34,10 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/apps/note.js b/lib/v2/qoo-app/apps/note.js index 8d911f96df..3855decdaf 100644 --- a/lib/v2/qoo-app/apps/note.js +++ b/lib/v2/qoo-app/apps/note.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { appsUrl } = require('../utils'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const link = `${appsUrl}${lang ? `/${lang}` : ''}/app-note/${id}`; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const list = $('.qoo-note-wrap') .toArray() @@ -28,7 +28,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const { data: response } = await got(item.link); - const $ = cheerio.load(response); + const $ = load(response); $('footer').remove(); item.description = $('article .content').html(); @@ -38,10 +38,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/apps/post.js b/lib/v2/qoo-app/apps/post.js index c7f1b5f8af..450915af5d 100644 --- a/lib/v2/qoo-app/apps/post.js +++ b/lib/v2/qoo-app/apps/post.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { appsUrl, newsUrl, fixImg } = require('../utils'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const link = `${appsUrl}${lang ? `/${lang}` : ''}/app-post/${id}`; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const list = $('.qoo-post-item') .toArray() @@ -30,7 +30,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const { data } = await got(`${newsUrl}${lang ? `/${lang}` : ''}/wp-json/wp/v2/posts/${item.postId}`); - const $ = cheerio.load(data.content.rendered, null, false); + const $ = load(data.content.rendered, null, false); fixImg($); @@ -42,10 +42,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/news.js b/lib/v2/qoo-app/news.js index d628b7e03e..c552979b48 100644 --- a/lib/v2/qoo-app/news.js +++ b/lib/v2/qoo-app/news.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { newsUrl, siteIcon, fixImg } = require('./utils'); @@ -10,12 +10,12 @@ module.exports = async (ctx) => { const { data } = await got(apiUrl, { searchParams: { - per_page: ctx.query.limit ? Number.parseInt(ctx.query.limit) : 100, + per_page: ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 100, }, }); const items = data.map((item) => { - const $ = cheerio.load(item.content.rendered, null, false); + const $ = load(item.content.rendered, null, false); fixImg($); @@ -27,7 +27,7 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: 'QooApp : Anime Game Platform', description: lang === 'en' @@ -37,5 +37,5 @@ module.exports = async (ctx) => { link: `${newsUrl}${lang ? `/${lang}` : ''}`, language: lang === 'en' ? 'en' : 'zh', item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/notes/note.js b/lib/v2/qoo-app/notes/note.js index 6e7bb12ae3..8d68a71276 100644 --- a/lib/v2/qoo-app/notes/note.js +++ b/lib/v2/qoo-app/notes/note.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { ssoUrl, notesUrl } = require('../utils'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -11,13 +11,13 @@ module.exports = async (ctx) => { const link = `${notesUrl}/note/${id}`; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const { data } = await got(api, { searchParams: { sort: 'newest', for: 'web', - limit: ctx.query.limit ? Number.parseInt(ctx.query.limit) : 100, + limit: ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 100, type: 'note', object_id: id, }, @@ -34,10 +34,10 @@ module.exports = async (ctx) => { guid: `qoo-app:notes:note:${id}:${item.id}`, })); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/notes/topic.js b/lib/v2/qoo-app/notes/topic.js index 0f99cba5dd..5110fb6efb 100644 --- a/lib/v2/qoo-app/notes/topic.js +++ b/lib/v2/qoo-app/notes/topic.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { notesUrl, extractNotes } = require('../utils'); module.exports = async (ctx) => { @@ -7,14 +7,14 @@ module.exports = async (ctx) => { const link = `${notesUrl}${lang ? `/${lang}` : ''}/topic/${topic}`; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const items = extractNotes($); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/notes/user.js b/lib/v2/qoo-app/notes/user.js index cd721fd8ec..92f9040df9 100644 --- a/lib/v2/qoo-app/notes/user.js +++ b/lib/v2/qoo-app/notes/user.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { notesUrl, extractNotes } = require('../utils'); module.exports = async (ctx) => { @@ -7,14 +7,14 @@ module.exports = async (ctx) => { const link = `${notesUrl}${lang ? `/${lang}` : ''}/user/${uid}`; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const items = extractNotes($); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/user/app-comment.js b/lib/v2/qoo-app/user/app-comment.js index 14fbf0ad53..641c10ea3f 100644 --- a/lib/v2/qoo-app/user/app-comment.js +++ b/lib/v2/qoo-app/user/app-comment.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { userUrl, appsUrl } = require('../utils'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -17,7 +17,7 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(response); + const $ = load(response); const username = $('.person .name').text(); const items = data.list.map((item) => ({ @@ -31,11 +31,11 @@ module.exports = async (ctx) => { author: username, })); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, image: decodeURIComponent($('.person div.slot').attr('data-args')).replace('avatar=', '').split('?')[0], language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/utils.js b/lib/v2/qoo-app/utils.js index f47f4d9391..2451a1fcdd 100644 --- a/lib/v2/qoo-app/utils.js +++ b/lib/v2/qoo-app/utils.js @@ -1,5 +1,5 @@ -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const appsUrl = 'https://apps.qoo-app.com'; const newsUrl = 'https://news.qoo-app.com'; diff --git a/lib/v2/qq/ac/comic.js b/lib/v2/qq/ac/comic.js index 3d8429e53f..12dc5233e0 100644 --- a/lib/v2/qq/ac/comic.js +++ b/lib/v2/qq/ac/comic.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { rootUrl, mobileRootUrl } = require('./utils'); module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const currentUrl = `${rootUrl}/Comic/comicInfo/id/${id}`; const mobileCurrentUrl = `${mobileRootUrl}/comic/index/id/${id}`; @@ -14,7 +14,7 @@ module.exports = async (ctx) => { url: mobileCurrentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const author = $('.author-wr') .toArray() @@ -34,10 +34,10 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: `${$('h1').text()} - 腾讯动漫`, link: currentUrl, item: items, description: `
Metacritic Score: ${item.metascore}
User Score: ${item.userscore}
`, link: item.url, })), - }; + }); }; diff --git a/lib/v2/meteor/boards.js b/lib/v2/meteor/boards.js index bcd2a74c7b..204c1d96ab 100644 --- a/lib/v2/meteor/boards.js +++ b/lib/v2/meteor/boards.js @@ -3,9 +3,9 @@ const { baseUrl, getBoards } = require('./utils'); module.exports = async (ctx) => { const items = await getBoards(ctx.cache.tryGet); - ctx.state.data = { + ctx.set('data', { title: '看板列表', link: `${baseUrl}/board/all`, item: items, - }; + }); }; diff --git a/lib/v2/meteor/index.js b/lib/v2/meteor/index.js index d32393b2e4..baf5ca0f0d 100644 --- a/lib/v2/meteor/index.js +++ b/lib/v2/meteor/index.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const { baseUrl, getBoards, renderDesc } = require('./utils'); module.exports = async (ctx) => { @@ -17,7 +17,7 @@ module.exports = async (ctx) => { boardId: board, isCollege: false, page: 0, - pageSize: ctx.query.limit ? Number(ctx.query.limit) : 30, + pageSize: ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 30, }, }); @@ -35,11 +35,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${board === 'all' ? '全部看板' : boardInfo.title} | Meteor 學生社群`, description: board === 'all' ? null : boardInfo.feedDescription, image: board === 'all' ? null : boardInfo.imgUrl === 'not_set' ? null : boardInfo.imgUrl, link: `${board === 'all' ? `${baseUrl}/board/all` : boardInfo.link}/new`, item: items, - }; + }); }; diff --git a/lib/v2/meteor/utils.js b/lib/v2/meteor/utils.js index fb3a54bbea..a8711d0eb9 100644 --- a/lib/v2/meteor/utils.js +++ b/lib/v2/meteor/utils.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); const baseUrl = 'https://meteor.today'; diff --git a/lib/v2/metmuseum/exhibitions.js b/lib/v2/metmuseum/exhibitions.js index 4bb01e156f..c256c419c4 100644 --- a/lib/v2/metmuseum/exhibitions.js +++ b/lib/v2/metmuseum/exhibitions.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; function generateExhibitionItem(result) { return { @@ -12,7 +12,7 @@ function generateExhibitionItem(result) { } module.exports = async (ctx) => { - const searchType = ctx.params.state ?? 'current'; + const searchType = ctx.req.param('state') ?? 'current'; const url = `https://www.metmuseum.org/ghidorah/ExhibitionListing/Search?searchType=${searchType}`; @@ -23,9 +23,9 @@ module.exports = async (ctx) => { const data = response.data.data; - ctx.state.data = { + ctx.set('data', { title: 'The Metropolitan Museum of Art - Exhibitions', link: 'https://www.metmuseum.org/exhibitions', item: data.results.map((element) => generateExhibitionItem(element)), - }; + }); }; diff --git a/lib/v2/mihoyo/bbs/cache.js b/lib/v2/mihoyo/bbs/cache.js index 6ed3647b39..69b1ffbfc1 100644 --- a/lib/v2/mihoyo/bbs/cache.js +++ b/lib/v2/mihoyo/bbs/cache.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const config = require('@/config').value; +import got from '@/utils/got'; +import { config } from '@/config'; module.exports = { getUserFullInfo: (ctx, uid) => { diff --git a/lib/v2/mihoyo/bbs/follow-list.js b/lib/v2/mihoyo/bbs/follow-list.js index 8acbf2588c..a314fc2b99 100644 --- a/lib/v2/mihoyo/bbs/follow-list.js +++ b/lib/v2/mihoyo/bbs/follow-list.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); const cache = require('./cache'); @@ -7,7 +7,7 @@ const renderDescription = (description, images) => art(path.join(__dirname, '../ module.exports = async (ctx) => { const { uid } = ctx.params; - const page_size = ctx.query.limit || '20'; + const page_size = ctx.req.query('limit') || '20'; const searchParams = { gids: 2, uid, diff --git a/lib/v2/mihoyo/bbs/img-ranking.js b/lib/v2/mihoyo/bbs/img-ranking.js index e2a3dd51a7..1e2c1b64ea 100644 --- a/lib/v2/mihoyo/bbs/img-ranking.js +++ b/lib/v2/mihoyo/bbs/img-ranking.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { DATA_MAP, RANKING_TYPE_MAP } = require('./static-data'); const { post2item } = require('./utils'); @@ -40,9 +40,9 @@ const getRankingTypeInfo = (game, ranking_type) => { module.exports = async (ctx) => { const { game } = ctx.params; - const routeParams = Object.fromEntries(new URLSearchParams(ctx.params.routeParams)); + const routeParams = Object.fromEntries(new URLSearchParams(ctx.req.param('routeParams'))); const { forumType: forum_type = 'tongren', cateType: cate_type, rankingType: ranking_type, lastId: last_id = '' } = routeParams; - const page_size = ctx.query.limit || '20'; + const page_size = ctx.req.query('limit') || '20'; const { gids, title: game_title } = getGameInfo(game); if (!gids) { throw new Error('未知的游戏！'); diff --git a/lib/v2/mihoyo/bbs/official.js b/lib/v2/mihoyo/bbs/official.js index 9e38ea88bb..2131b8c47e 100644 --- a/lib/v2/mihoyo/bbs/official.js +++ b/lib/v2/mihoyo/bbs/official.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { post2item } = require('./utils'); // 游戏id const GITS_MAP = { diff --git a/lib/v2/mihoyo/bbs/timeline.js b/lib/v2/mihoyo/bbs/timeline.js index 5e580ff6f5..e9c64acbce 100644 --- a/lib/v2/mihoyo/bbs/timeline.js +++ b/lib/v2/mihoyo/bbs/timeline.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const cache = require('./cache'); -const config = require('@/config').value; +import { config } from '@/config'; const { post2item } = require('./utils'); module.exports = async (ctx) => { @@ -8,7 +8,7 @@ module.exports = async (ctx) => { throw new Error('Miyoushe Timeline is not available due to the absense of [Miyoushe Cookie]. Check relevant config tutorial'); } - const page_size = ctx.query.limit || '20'; + const page_size = ctx.req.query('limit') || '20'; const searchParams = { gids: 2, page_size, diff --git a/lib/v2/mihoyo/bbs/user-post.js b/lib/v2/mihoyo/bbs/user-post.js index 547ff0fa33..b9adf4d76c 100644 --- a/lib/v2/mihoyo/bbs/user-post.js +++ b/lib/v2/mihoyo/bbs/user-post.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { post2item } = require('./utils'); module.exports = async (ctx) => { const { uid } = ctx.params; - const size = ctx.query.limit || '20'; + const size = ctx.req.query('limit') || '20'; const searchParams = { uid, size, diff --git a/lib/v2/mihoyo/bbs/utils.js b/lib/v2/mihoyo/bbs/utils.js index 165d8fdd0b..1cad74e011 100644 --- a/lib/v2/mihoyo/bbs/utils.js +++ b/lib/v2/mihoyo/bbs/utils.js @@ -1,6 +1,6 @@ -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; const renderDescription = (description, images) => art(path.join(__dirname, '../templates/description.art'), { description, images }); diff --git a/lib/v2/mihoyo/sr/news.js b/lib/v2/mihoyo/sr/news.js index a48c485377..6d860c45d5 100644 --- a/lib/v2/mihoyo/sr/news.js +++ b/lib/v2/mihoyo/sr/news.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const categories = { 'zh-cn': { @@ -45,7 +45,7 @@ const categories = { module.exports = async (ctx) => { // location 地区 category 类型 const { location = 'zh-cn', category = 'news-all' } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 50; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 50; const url = location === 'zh-cn' ? `https://api-takumi-static.mihoyo.com/content_v2_user/app/1963de8dc19e461c/getContentList?iPage=1&iPageSize=${limit}&sLangKey=zh-cn&isPreview=0&iChanId=${categories[location][category].id}` @@ -61,9 +61,9 @@ module.exports = async (ctx) => { category: item.sCategoryName, })); - ctx.state.data = { + ctx.set('data', { title: `${categories[location][category].title}-崩坏：星穹铁道`, link: url, item: items, - }; + }); }; diff --git a/lib/v2/mihoyo/ys/news.js b/lib/v2/mihoyo/ys/news.js index f9b7251ea2..ce16279ca8 100644 --- a/lib/v2/mihoyo/ys/news.js +++ b/lib/v2/mihoyo/ys/news.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const categories = { @@ -76,9 +76,9 @@ const apiUrls = { }; module.exports = async (ctx) => { - const location = ctx.params.location ?? 'main'; - const category = ctx.params.category ?? 'latest'; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 50; + const location = ctx.req.param('location') ?? 'main'; + const category = ctx.req.param('category') ?? 'latest'; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 50; const params = { main: `pageNum=1&channelId=${categories[category][location].id}&pageSize=${limit}`, @@ -153,9 +153,9 @@ module.exports = async (ctx) => { ); } - ctx.state.data = { + ctx.set('data', { title: `原神 - ${categories[category][location].title}`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/mindmeister/example.js b/lib/v2/mindmeister/example.js index 764ef3f669..15ef4994ba 100644 --- a/lib/v2/mindmeister/example.js +++ b/lib/v2/mindmeister/example.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { art } from '@/utils/render'; const path = require('path'); const baseUrl = 'https://www.mindmeister.com'; @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const link = `${baseUrl}${language === 'en' || language === 'other' ? '' : `/${language}`}/${category === 'mind-map-examples' ? category : `mind-maps/${category}?language=${language}`}`; const respsonse = await got(link); - const $ = cheerio.load(respsonse.data); + const $ = load(respsonse.data); const items = $('#public-listing .map-tile-wrapper') .toArray() @@ -34,11 +34,11 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), description: $('head meta[name=description]').text(), link, item: items, language, - }; + }); }; diff --git a/lib/v2/minecraft/version.js b/lib/v2/minecraft/version.js index 81ce238815..bb482dd588 100644 --- a/lib/v2/minecraft/version.js +++ b/lib/v2/minecraft/version.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; module.exports = async (ctx) => { const url = 'https://launchermeta.mojang.com/mc/game/version_manifest.json'; @@ -19,7 +19,7 @@ module.exports = async (ctx) => { const title = `Minecraft Java版游戏更新`; - ctx.state.data = { + ctx.set('data', { title, link: `https://www.minecraft.net/`, description: title, @@ -30,5 +30,5 @@ module.exports = async (ctx) => { link: `https://www.minecraft.net`, guid: item.id + item.type, })), - }; + }); }; diff --git a/lib/v2/mingpao/index.js b/lib/v2/mingpao/index.js index 1dbe50a8ed..35dc861726 100644 --- a/lib/v2/mingpao/index.js +++ b/lib/v2/mingpao/index.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const parser = require('@/utils/rss-parser'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const logger = require('@/utils/logger'); @@ -18,8 +18,8 @@ const renderDesc = (media, desc) => }); module.exports = async (ctx) => { - const type = ctx.params.type ?? 'ins'; - const category = ctx.params.category ?? (type === 'ins' ? 'all' : 's00001'); + const type = ctx.req.param('type') ?? 'ins'; + const category = ctx.req.param('category') ?? (type === 'ins' ? 'all' : 's00001'); const link = `https://news.mingpao.com/rss/${type}/${category}.xml`; const feed = await parser.parseURL(link); @@ -42,7 +42,7 @@ module.exports = async (ctx) => { throw error; } - const $ = cheerio.load(response.data); + const $ = load(response.data); const fancyboxImg = $('a.fancybox').length ? $('a.fancybox') : $('a.fancybox-buttons'); // remove unwanted elements @@ -88,12 +88,12 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: feed.title, link: feed.link, description: feed.description, item: items, image: feed.image.url, language: feed.language, - }; + }); }; diff --git a/lib/v2/mirror/index.js b/lib/v2/mirror/index.js index 5caa18d043..c0c504b6ed 100644 --- a/lib/v2/mirror/index.js +++ b/lib/v2/mirror/index.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const md = require('markdown-it')({ html: true, linkify: true, @@ -7,7 +7,7 @@ const md = require('markdown-it')({ const { isValidHost } = require('@/utils/valid-host'); module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); if (!id.endsWith('.eth') && !isValidHost(id)) { throw new Error('Invalid id'); } @@ -31,11 +31,11 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: `${data.props.pageProps.publicationLayoutProject.displayName} - Mirror`, description: data.props.pageProps.publicationLayoutProject.description, image: data.props.pageProps.publicationLayoutProject.avatarURL, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/missav/new.js b/lib/v2/missav/new.js index 2a4858b827..c8cdc100a5 100644 --- a/lib/v2/missav/new.js +++ b/lib/v2/missav/new.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { const baseUrl = 'https://missav.com'; const { data: response } = await got(`${baseUrl}/dm397/new`); - const $ = cheerio.load(response); + const $ = load(response); const items = $('.grid .group') .toArray() @@ -27,10 +27,10 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), description: $('head meta[name="description"]').attr('content'), link: baseUrl, item: items, - }; + }); }; diff --git a/lib/v2/misskey/featured-notes.js b/lib/v2/misskey/featured-notes.js index 3830d43567..e5dd4a1a83 100644 --- a/lib/v2/misskey/featured-notes.js +++ b/lib/v2/misskey/featured-notes.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const utils = require('./utils'); -const config = require('@/config').value; +import { config } from '@/config'; module.exports = async (ctx) => { - const site = ctx.params.site; + const site = ctx.req.param('site'); if (!config.feature.allow_user_supply_unsafe_domain && !utils.allowSiteList.includes(site)) { - ctx.throw(403, `This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`); + throw new Error(`This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`); } // docs on: https://misskey-hub.net/docs/api/endpoints/notes/featured.html @@ -21,9 +21,9 @@ module.exports = async (ctx) => { const list = response.data; - ctx.state.data = { + ctx.set('data', { title: `Featured Notes on ${site}`, link: `https://${site}/explore`, item: utils.parseNotes(list, site), - }; + }); }; diff --git a/lib/v2/misskey/utils.js b/lib/v2/misskey/utils.js index 4f64633485..546febb03d 100644 --- a/lib/v2/misskey/utils.js +++ b/lib/v2/misskey/utils.js @@ -1,5 +1,5 @@ -const { art } = require('@/utils/render'); -const { parseDate } = require('@/utils/parse-date'); +import { art } from '@/utils/render'; +import { parseDate } from '@/utils/parse-date'; const path = require('path'); const allowSiteList = ['misskey.io', 'madost.one', 'mk.nixnet.social']; diff --git a/lib/v2/mittrchina/index.js b/lib/v2/mittrchina/index.js index 3cef7e45ec..53cc349eda 100644 --- a/lib/v2/mittrchina/index.js +++ b/lib/v2/mittrchina/index.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -24,7 +24,7 @@ module.exports = async (ctx) => { }; const { type = 'index' } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 10; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 10; const link = `https://apii.mittrchina.com${typeMap[type].apiPath}`; const { data: response } = @@ -91,9 +91,9 @@ module.exports = async (ctx) => { ); } - ctx.state.data = { + ctx.set('data', { title: `MIT 科技评论 - ${typeMap[type].title}`, link: `https://www.mittrchina.com/${type}`, item: items, - }; + }); }; diff --git a/lib/v2/mixcloud/index.js b/lib/v2/mixcloud/index.js index 9f2f7d3d2f..d690e89e0f 100644 --- a/lib/v2/mixcloud/index.js +++ b/lib/v2/mixcloud/index.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const CryptoJS = require('crypto-js'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; const { queries } = require('./queries'); module.exports = async (ctx) => { @@ -13,11 +13,11 @@ module.exports = async (ctx) => { 'X-Requested-With': 'XMLHttpRequest', }; - const type = ctx.params.type ?? 'uploads'; + const type = ctx.req.param('type') ?? 'uploads'; if (!['stream', 'uploads', 'favorites', 'listens'].includes(type)) { throw new Error(`Invalid type: ${type}`); } - const username = ctx.params.username; + const username = ctx.req.param('username'); const config = { stream: { name: 'Stream', node: 'stream' }, @@ -30,7 +30,7 @@ module.exports = async (ctx) => { query: queries.stream.query, variables: { lookup: { - username: ctx.params.username, + username: ctx.req.param('username'), }, }, }, @@ -38,7 +38,7 @@ module.exports = async (ctx) => { query: queries.uploads.query, variables: { lookup: { - username: ctx.params.username, + username: ctx.req.param('username'), }, orderBy: 'LATEST', }, @@ -47,7 +47,7 @@ module.exports = async (ctx) => { query: queries.favorites.query, variables: { lookup: { - username: ctx.params.username, + username: ctx.req.param('username'), }, }, }, @@ -55,7 +55,7 @@ module.exports = async (ctx) => { query: queries.listens.query, variables: { lookup: { - username: ctx.params.username, + username: ctx.req.param('username'), }, }, }, @@ -102,12 +102,12 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: `Mixcloud - ${data.user.displayName}'s ${config[type].name}`, description: biog.replaceAll('\n', '
'), itunes_author: data.user.displayName, image, link: `${host}/${username}/${type}/`, item: items, - }; + }); }; diff --git a/lib/v2/modb/topic.js b/lib/v2/modb/topic.js index 7c7bd684e5..572f8c9c4d 100644 --- a/lib/v2/modb/topic.js +++ b/lib/v2/modb/topic.js @@ -1,12 +1,12 @@ -const cheerio = require('cheerio'); -const got = require('@/utils/got'); +import { load } from 'cheerio'; +import got from '@/utils/got'; const logger = require('@/utils/logger'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const baseUrl = 'https://www.modb.pro'; - const topicId = ctx.params.id; + const topicId = ctx.req.param('id'); const response = await got({ url: `${baseUrl}/api/columns/getKnowledge`, searchParams: { @@ -44,16 +44,16 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const { data: response } = await got(item.link); - const $ = cheerio.load(response); + const $ = load(response); item.description = $('div.editor-content-styl.article-style').first().html(); return item; }) ) ); - ctx.state.data = { + ctx.set('data', { title: '墨天轮合辑', link: `${baseUrl}/topic/${topicId}`, item: items, - }; + }); }; diff --git a/lib/v2/modelscope/community.js b/lib/v2/modelscope/community.js index 18f644736e..6cda3f07f3 100644 --- a/lib/v2/modelscope/community.js +++ b/lib/v2/modelscope/community.js @@ -1,15 +1,15 @@ -const cheerio = require('cheerio'); -const got = require('@/utils/got'); +import { load } from 'cheerio'; +import got from '@/utils/got'; const path = require('path'); -const timezone = require('@/utils/timezone'); -const { art } = require('@/utils/render'); -const { parseDate } = require('@/utils/parse-date'); +import timezone from '@/utils/timezone'; +import { art } from '@/utils/render'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const baseUrl = 'https://community.modelscope.cn'; const { data } = await got.post(`${baseUrl}/v1/namespace_page/article`, { - json: { id: 142373, notInMediaAidList: [], pageNum: 1, pageSize: ctx.query.limit ? Number.parseInt(ctx.query.limit) : 30 }, + json: { id: 142373, notInMediaAidList: [], pageNum: 1, pageSize: ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 30 }, }); const articles = data.data.content.map((c) => ({ @@ -27,7 +27,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(item.link, async () => { const { data } = await got(item.link); - const $ = cheerio.load(data); + const $ = load(data); const initialData = JSON.parse( $('script') .text() @@ -45,11 +45,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'ModelScope魔搭社区-DevPress官方社区', description: 'ModelScope魔搭社区 DevPress官方社区-ModelScope旨在打造下一代开源的模型即服务共享平台，为泛AI开发者提供灵活、易用、低成本的一站式模型服务产品，让模型应用更简单。', image: 'https://g.alicdn.com/sail-web/maas/0.8.10/favicon/128.ico', link: baseUrl, item: items, - }; + }); }; diff --git a/lib/v2/modelscope/datasets.js b/lib/v2/modelscope/datasets.js index 0671c278e7..a3f68de09f 100644 --- a/lib/v2/modelscope/datasets.js +++ b/lib/v2/modelscope/datasets.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const md = require('markdown-it')({ html: true, linkify: true, }); const path = require('path'); -const { art } = require('@/utils/render'); -const { parseDate } = require('@/utils/parse-date'); +import { art } from '@/utils/render'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const baseUrl = 'https://modelscope.cn'; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { const { data } = await got(`${baseUrl}/api/v1/dolphin/datasets`, { searchParams: { - PageSize: ctx.query.limit ? Number.parseInt(ctx.query.limit) : 36, + PageSize: ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 36, PageNumber: 1, Target: '', Sort: 'gmt_modified', @@ -45,11 +45,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '数据集首页 · 魔搭社区', description: 'ModelScope——汇聚各领域先进的机器学习模型，提供模型探索体验、推理、训练、部署和应用的一站式服务。在这里，共建模型开源社区，发现、学习、定制和分享心仪的模型。', image: 'https://g.alicdn.com/sail-web/maas/0.8.10/favicon/128.ico', link, item: items, - }; + }); }; diff --git a/lib/v2/modelscope/models.js b/lib/v2/modelscope/models.js index 841c15896e..3c71a33f47 100644 --- a/lib/v2/modelscope/models.js +++ b/lib/v2/modelscope/models.js @@ -1,16 +1,16 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const md = require('markdown-it')({ html: true, linkify: true, }); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const baseUrl = 'https://modelscope.cn'; const link = `${baseUrl}/models`; const { data } = await got.put(`${baseUrl}/api/v1/dolphin/models`, { - json: { PageSize: ctx.query.limit ? Number.parseInt(ctx.query.limit) : 36, PageNumber: 1, SortBy: 'GmtModified', Target: '', SingleCriterion: [] }, + json: { PageSize: ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 36, PageNumber: 1, SortBy: 'GmtModified', Target: '', SingleCriterion: [] }, }); const models = data.Data.Model.Models.map((model) => ({ @@ -35,11 +35,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '模型库首页 · 魔搭社区', description: 'ModelScope——汇聚各领域先进的机器学习模型，提供模型探索体验、推理、训练、部署和应用的一站式服务。在这里，共建模型开源社区，发现、学习、定制和分享心仪的模型。', image: 'https://g.alicdn.com/sail-web/maas/0.8.10/favicon/128.ico', link, item: items, - }; + }); }; diff --git a/lib/v2/modelscope/studios.js b/lib/v2/modelscope/studios.js index 5a4444691f..4fae2f9fd1 100644 --- a/lib/v2/modelscope/studios.js +++ b/lib/v2/modelscope/studios.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const md = require('markdown-it')({ html: true, linkify: true, }); const path = require('path'); -const { art } = require('@/utils/render'); -const { parseDate } = require('@/utils/parse-date'); +import { art } from '@/utils/render'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const baseUrl = 'https://modelscope.cn'; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { const { data } = await got.put(`${baseUrl}/api/v1/studios`, { json: { - PageSize: ctx.query.limit ? Number.parseInt(ctx.query.limit) : 36, + PageSize: ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 36, PageNumber: 1, SortBy: 'gmt_modified', }, @@ -47,11 +47,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '创空间首页 · 魔搭社区', description: 'ModelScope——汇聚各领域先进的机器学习模型，提供模型探索体验、推理、训练、部署和应用的一站式服务。在这里，共建模型开源社区，发现、学习、定制和分享心仪的模型。', image: 'https://g.alicdn.com/sail-web/maas/0.8.10/favicon/128.ico', link, item: items, - }; + }); }; diff --git a/lib/v2/modrinth/versions.js b/lib/v2/modrinth/versions.js index 3dca9eb7b9..385fa9f146 100644 --- a/lib/v2/modrinth/versions.js +++ b/lib/v2/modrinth/versions.js @@ -1,9 +1,10 @@ -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); -const { value: config } = require('@/config'); +import { config } from '@/config'; +import got from '@/utils/got'; -const got = require('@/utils/got').extend({ +const customGot = got.extend({ headers: { // https://docs.modrinth.com/#section/User-Agents 'user-agent': config.trueUA, @@ -38,13 +39,13 @@ module.exports = async ( try { /** @type {import('./api').Project} */ - const project = await got(`https://api.modrinth.com/v2/project/${id}`).json(); + const project = await customGot(`https://api.modrinth.com/v2/project/${id}`).json(); /** @type {import('./api').Version[]} */ - const versions = await got(`https://api.modrinth.com/v2/project/${id}/version`, { + const versions = await customGot(`https://api.modrinth.com/v2/project/${id}/version`, { searchParams: parsedQuery, }).json(); /** @type {import('./api').Author[]} */ - const authors = await got(`https://api.modrinth.com/v2/users`, { + const authors = await customGot(`https://api.modrinth.com/v2/users`, { searchParams: { ids: JSON.stringify(versions.map((it) => it.author_id)), }, diff --git a/lib/v2/mohw/clarification.js b/lib/v2/mohw/clarification.js index 354f59bc02..22b8480731 100644 --- a/lib/v2/mohw/clarification.js +++ b/lib/v2/mohw/clarification.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const rootUrl = 'https://www.mohw.gov.tw'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.list01 a[title]') .toArray() @@ -32,7 +32,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('article').html(); item.pubDate = parseDate(content('meta[name="DC.Date"]').attr('datetime')); @@ -42,9 +42,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '即時新聞澄清 - 台灣衛生福利部', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/mox/index.js b/lib/v2/mox/index.js index 1a6bb5e825..481c5840ad 100644 --- a/lib/v2/mox/index.js +++ b/lib/v2/mox/index.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const category = ctx.params.category ?? ''; + const category = ctx.req.param('category') ?? ''; const rootUrl = 'https://mox.moe'; const currentUrl = `${rootUrl}${category ? `/l/${category}` : ''}`; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.listbg td') .toArray() @@ -39,7 +39,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.author = content('.status font a').first().text(); item.description = `
${content('.author').html()}
${content('#desc_text').html()}`; @@ -49,9 +49,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'Mox.moe', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/mpaypass/main.js b/lib/v2/mpaypass/main.js index 6c74d08d2d..d1ff3a47cb 100644 --- a/lib/v2/mpaypass/main.js +++ b/lib/v2/mpaypass/main.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const { type = '' } = ctx.params; @@ -14,7 +14,7 @@ module.exports = async (ctx) => { const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const title_cn = type ? $(`a[href="http://www.mpaypass.com.cn/${type}.html"]`).text() : '最新文章'; const list = $('.newslist') @@ -37,7 +37,7 @@ module.exports = async (ctx) => { list.map((info) => ctx.cache.tryGet(info.link, async () => { const response = await got(info.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const newsbody = $('div.newsbody').html(); return { @@ -51,9 +51,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `移动支付网-${title_cn}`, link: title_url, item: out, - }; + }); }; diff --git a/lib/v2/mpaypass/news.js b/lib/v2/mpaypass/news.js index 5dbb471c88..e8d81f973f 100644 --- a/lib/v2/mpaypass/news.js +++ b/lib/v2/mpaypass/news.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const link = 'http://m.mpaypass.com.cn'; const listData = await got(link); - const $list = cheerio.load(listData.data); - ctx.state.data = { + const $list = load(listData.data); + ctx.set('data', { title: '新闻 - 移动支付网', link, language: 'zh-CN', @@ -22,7 +22,7 @@ module.exports = async (ctx) => { return ctx.cache.tryGet(href, async () => { const contentData = await got.get(href); - const $content = cheerio.load(contentData.data); + const $content = load(contentData.data); const description = $content('.newslist-body').html(); return { @@ -35,5 +35,5 @@ module.exports = async (ctx) => { }) .get() ), - }; + }); }; diff --git a/lib/v2/mrdx/daily.js b/lib/v2/mrdx/daily.js index b2dfa999c4..0d4bcd4c53 100644 --- a/lib/v2/mrdx/daily.js +++ b/lib/v2/mrdx/daily.js @@ -1,11 +1,11 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { getElementChildrenInnerText } = require('./utils'); const dayjs = require('dayjs'); const utc = require('dayjs/plugin/utc'); dayjs.extend(utc); -const got = require('@/utils/got'); +import got from '@/utils/got'; module.exports = async (ctx) => { const dateFormatted = dayjs().utcOffset(8).format('YYYYMMDD'); @@ -17,7 +17,7 @@ module.exports = async (ctx) => { url: link, method: 'get', }); - const $ = cheerio.load(indexPageResponse.data); + const $ = load(indexPageResponse.data); // 当日所有文章Url在的`daoxiang` attribute中 // 其站点使用**非标准**的HTML语法 @@ -36,7 +36,7 @@ module.exports = async (ctx) => { method: 'get', }); - const $ = cheerio.load(response.data); + const $ = load(response.data); // 标题在`h2`,`h3`,`h4`,`h5`中，有多余空格和换行符 // 但是Middleware会处理 @@ -69,11 +69,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '新华每日电讯', link, item: passages, description: '中国报纸发行前三强。位列《人民日报》，《参考消息》之后。《新华每日电讯》是新华社出版的一份新闻电讯报，1993年创办，具有很高的权威性和准确性，有“一报在手，便知天下”之美誉。《新华每日电讯》为对开八版日报，集中刊登[新华社]每天向国内播发的电讯稿及图片稿。打开《新华每日电讯》，中国和全世界每天发生的重大事件便将一目了然。在人类生活节奏日益加快的当今世界，《新华每日电讯》以最便捷、最醒目的方式为公众提供最重要的新闻报道，受到公众的喜爱和拥护。', - }; + }); }; diff --git a/lib/v2/mrm/index.js b/lib/v2/mrm/index.js index eef3547418..d47cdbe335 100644 --- a/lib/v2/mrm/index.js +++ b/lib/v2/mrm/index.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const { category = 'zonghezixun3' } = ctx.params; @@ -8,7 +8,7 @@ module.exports = async (ctx) => { const link = `${baseUrl}/${category}.html`; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const list = $('#datalist_wap .li') .toArray() @@ -26,7 +26,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const { data } = await got(item.link); - const $ = cheerio.load(data); + const $ = load(data); item.description = $('.article-cont').html(); return item; @@ -34,9 +34,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, item: items, - }; + }); }; diff --git a/lib/v2/mvm/index.js b/lib/v2/mvm/index.js index 79fe7183b2..5a6e2fa4d4 100644 --- a/lib/v2/mvm/index.js +++ b/lib/v2/mvm/index.js @@ -1,19 +1,19 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const category = ctx.params.category ?? 'bqym'; + const category = ctx.req.param('category') ?? 'bqym'; const rootUrl = 'http://www.mwm.net.cn'; - const currentUrl = `${rootUrl}/web/${category === 'bqym' ? `bqym?pagesize=${ctx.query.limit ?? 100}` : category}`; + const currentUrl = `${rootUrl}/web/${category === 'bqym' ? `bqym?pagesize=${ctx.req.query('limit') ?? 100}` : category}`; const response = await got({ method: 'get', url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); $('.n_date').remove(); @@ -36,7 +36,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('.mrt20').html(); item.author = content('.mrl20') @@ -50,9 +50,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/mydrivers/cid.js b/lib/v2/mydrivers/cid.js index 3b568aa971..05d9566032 100644 --- a/lib/v2/mydrivers/cid.js +++ b/lib/v2/mydrivers/cid.js @@ -1,11 +1,11 @@ -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; const parser = require('@/utils/rss-parser'); const { rootUrl, rootRSSUrl, title, categories, getInfo, processItems } = require('./util'); module.exports = async (ctx) => { const { id } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 100; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 100; const queryString = id ? `?cid=${id}` : ''; const currentUrl = new URL(id ? `newsclass.aspx${queryString}` : '', rootUrl).href; @@ -28,10 +28,10 @@ module.exports = async (ctx) => { items = await processItems(items, ctx.cache.tryGet); } - ctx.state.data = { + ctx.set('data', { ...(await getInfo(currentUrl, ctx.cache.tryGet)), item: items, title: `${title} - ${feed.title.split(/_/).pop() || categories.zhibo}`, - }; + }); }; diff --git a/lib/v2/mydrivers/index.js b/lib/v2/mydrivers/index.js index c537c1caeb..973362351e 100644 --- a/lib/v2/mydrivers/index.js +++ b/lib/v2/mydrivers/index.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const { rootUrl, title, categories, convertToQueryString, getInfo, processItems } = require('./util'); @@ -17,7 +17,7 @@ module.exports = async (ctx) => { category = `ac/${category}`; } - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 20; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 20; const queryString = convertToQueryString(category); const currentUrl = new URL(`newsclass.aspx${queryString}`, rootUrl).href; @@ -26,7 +26,7 @@ module.exports = async (ctx) => { const { data: response } = await got(apiUrl); - const $ = cheerio.load(response); + const $ = load(response); let items = $('li[data-id]') .slice(0, limit) @@ -49,7 +49,7 @@ module.exports = async (ctx) => { items = await processItems(items, ctx.cache.tryGet); - ctx.state.data = { + ctx.set('data', { ...(await getInfo(currentUrl, ctx.cache.tryGet)), ...Object.fromEntries( Object.entries({ @@ -57,5 +57,5 @@ module.exports = async (ctx) => { title: newTitle, }).filter(([value]) => value) ), - }; + }); }; diff --git a/lib/v2/mydrivers/rank.js b/lib/v2/mydrivers/rank.js index 74eeb99079..9fa21d603e 100644 --- a/lib/v2/mydrivers/rank.js +++ b/lib/v2/mydrivers/rank.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { rootUrl, getInfo, processItems } = require('./util'); module.exports = async (ctx) => { const { range = '0' } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 10; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 10; const currentUrl = new URL('newsclass.aspx?tid=1001', rootUrl).href; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { const { data: response } = await got(apiUrl); - const $ = cheerio.load(response); + const $ = load(response); let items = $('a') .toArray() @@ -33,8 +33,8 @@ module.exports = async (ctx) => { items = await processItems(items, ctx.cache.tryGet); - ctx.state.data = { + ctx.set('data', { item: items, ...(await getInfo(currentUrl, ctx.cache.tryGet, Number.parseInt(range, 10))), - }; + }); }; diff --git a/lib/v2/mydrivers/util.js b/lib/v2/mydrivers/util.js index 1b0581c3be..f2bebbe2f8 100644 --- a/lib/v2/mydrivers/util.js +++ b/lib/v2/mydrivers/util.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const domain = 'mydrivers.com'; const rootUrl = `https://m.${domain}`; @@ -50,7 +50,7 @@ const getInfo = (url, tryGet, range) => tryGet(url, async () => { const { data: response } = await got(url); - const $ = cheerio.load(response); + const $ = load(response); const icon = new URL($('link[rel="apple-touch-icon-precomposed"]').prop('href'), rootUrl).href; const image = `https:${$('div.logo a img').prop('src')}`; @@ -91,7 +91,7 @@ const processItems = async (items, tryGet) => }, }); - const content = cheerio.load(detailResponse); + const content = load(detailResponse); item.title = content('div.news_t').text() || item.title; item.description = content('#content').html() ?? item.description; diff --git a/lib/v2/myfigurecollection/activity.js b/lib/v2/myfigurecollection/activity.js index db22714307..25fa507793 100644 --- a/lib/v2/myfigurecollection/activity.js +++ b/lib/v2/myfigurecollection/activity.js @@ -1,18 +1,18 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const { isValidHost } = require('@/utils/valid-host'); module.exports = async (ctx) => { - const category = ctx.params.category ?? '-1'; - const language = ctx.params.language ?? ''; - const latestAdditions = ctx.params.latestAdditions ?? '1'; - const latestEdits = ctx.params.latestEdits ?? '1'; - const latestAlerts = ctx.params.latestAlerts ?? '1'; - const latestPictures = ctx.params.latestPictures ?? '1'; + const category = ctx.req.param('category') ?? '-1'; + const language = ctx.req.param('language') ?? ''; + const latestAdditions = ctx.req.param('latestAdditions') ?? '1'; + const latestEdits = ctx.req.param('latestEdits') ?? '1'; + const latestAlerts = ctx.req.param('latestAlerts') ?? '1'; + const latestPictures = ctx.req.param('latestPictures') ?? '1'; if (language && !isValidHost(language)) { throw new Error('Invalid language'); @@ -26,7 +26,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const items = $('.activity-wrapper') .toArray() @@ -53,11 +53,11 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('title') .text() .replace(/ \(.*\)/, ''), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/myfigurecollection/index.js b/lib/v2/myfigurecollection/index.js index b3170bb987..1cee5159b7 100644 --- a/lib/v2/myfigurecollection/index.js +++ b/lib/v2/myfigurecollection/index.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { art } from '@/utils/render'; const path = require('path'); const { isValidHost } = require('@/utils/valid-host'); @@ -11,8 +11,8 @@ const shortcuts = { }; module.exports = async (ctx) => { - const language = ctx.params.language ?? ''; - const category = ctx.params.category ?? 'figure'; + const language = ctx.req.param('language') ?? ''; + const category = ctx.req.param('category') ?? 'figure'; if (language && !isValidHost(language)) { throw new Error('Invalid language'); } @@ -25,10 +25,10 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.item-icon, .picture-icon') - .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 25) + .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 25) .toArray() .map((item) => { item = $(item).find('a'); @@ -49,7 +49,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.title = content('.headline').text(); item.description = art(path.join(__dirname, 'templates/description.art'), { @@ -72,11 +72,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title') .text() .replace(/ \(.*\)/, ''), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/mygopen/index.js b/lib/v2/mygopen/index.js index 7789bf3dea..131b84b6d9 100644 --- a/lib/v2/mygopen/index.js +++ b/lib/v2/mygopen/index.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const label = ctx.params.label ?? ''; + const label = ctx.req.param('label') ?? ''; const rootUrl = 'https://www.mygopen.com'; const currentUrl = `${rootUrl}${label ? `/search/label/${label}` : ''}`; - const apiUrl = `${rootUrl}/feeds/posts/default${label ? `/-/${label}` : ''}?alt=json-in-script&max-results=${ctx.query.limit ? Number.parseInt(ctx.query.limit) : 50}`; + const apiUrl = `${rootUrl}/feeds/posts/default${label ? `/-/${label}` : ''}?alt=json-in-script&max-results=${ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 50}`; const response = await got({ method: 'get', @@ -20,10 +20,10 @@ module.exports = async (ctx) => { link: item.link.pop().href, })); - ctx.state.data = { + ctx.set('data', { title: `MyGoPen${label ? `: ${label}` : ''}`, link: currentUrl, item: items, description: '詐騙與謠言頻傳的年代，「MyGoPen｜這是假消息」提醒網路使用者隨時要用謹慎懷疑的態度面對網路上的消息。', - }; + }); }; diff --git a/lib/v2/mymusicsheet/usersheets.js b/lib/v2/mymusicsheet/usersheets.js index 633f2e3e66..b978258bf6 100644 --- a/lib/v2/mymusicsheet/usersheets.js +++ b/lib/v2/mymusicsheet/usersheets.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -112,9 +112,9 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: `${username}'s sheets`, link: `https://www.mymusicsheet.com/${username}?viewType=sheet&orderBy=createdAt`, item: items, - }; + }); }; diff --git a/lib/v2/mysql/release.js b/lib/v2/mysql/release.js index b2cffdfc18..57614b5053 100644 --- a/lib/v2/mysql/release.js +++ b/lib/v2/mysql/release.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const config = require('@/config').value; -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { config } from '@/config'; +import { load } from 'cheerio'; module.exports = async (ctx) => { - const version = ctx.params.version ?? '8.0'; + const version = ctx.req.param('version') ?? '8.0'; const rootUrl = 'https://dev.mysql.com'; const currentUrl = `${rootUrl}/doc/relnotes/mysql/${version}/en/`; @@ -16,7 +16,7 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('dt span a') .slice(1, -1) @@ -41,7 +41,7 @@ module.exports = async (ctx) => { }, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); content('.indexterm').remove(); content('.titlepage').first().remove(); @@ -54,9 +54,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/nasa/apod-cn.js b/lib/v2/nasa/apod-cn.js index 394d622a83..a4d846fb3d 100644 --- a/lib/v2/nasa/apod-cn.js +++ b/lib/v2/nasa/apod-cn.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 10; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 10; const rootUrl = `https://www.nasachina.cn/wp-json/wp/v2/posts?categories=2&per_page=${limit}`; const { data } = await got({ method: 'get', @@ -16,9 +16,9 @@ module.exports = async (ctx) => { link: item.link, })); - ctx.state.data = { + ctx.set('data', { title: 'NASA中文 - 天文·每日一图', link: 'https://www.nasachina.cn/nasa-image-of-the-day', item: items, - }; + }); }; diff --git a/lib/v2/nasa/apod-ncku.js b/lib/v2/nasa/apod-ncku.js index 57203c82c4..dd18482942 100644 --- a/lib/v2/nasa/apod-ncku.js +++ b/lib/v2/nasa/apod-ncku.js @@ -1,16 +1,16 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 10; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 10; const rootUrl = 'http://sprite.phys.ncku.edu.tw/astrolab/mirrors/apod/archivepix.html'; const response = await got({ method: 'get', url: rootUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('body > b > a') .slice(0, limit) @@ -27,7 +27,7 @@ module.exports = async (ctx) => { method: 'get', url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); const description = `
${content('body > center').eq(1).html()}
${content('body > p').eq(0).html()}`; const pubDate = parseDate(item.link.slice(-11, -5), 'YYMMDD'); @@ -43,9 +43,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'NASA 每日一天文圖 (成大物理分站) ', link: rootUrl, item: items, - }; + }); }; diff --git a/lib/v2/nasa/apod.js b/lib/v2/nasa/apod.js index 603668218b..af88e76b70 100644 --- a/lib/v2/nasa/apod.js +++ b/lib/v2/nasa/apod.js @@ -1,16 +1,16 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 10; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 10; const rootUrl = 'https://apod.nasa.gov/apod/archivepix.html'; const response = await got({ method: 'get', url: rootUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('body > b > a') .slice(0, limit) @@ -27,7 +27,7 @@ module.exports = async (ctx) => { method: 'get', url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); const description = `
${content('body > center').eq(1).html()}
${content('body > p').eq(0).html()}`; const pubDate = timezone(parseDate(item.link.slice(-11, -5), 'YYMMDD'), -5); @@ -43,9 +43,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'NASA Astronomy Picture of the Day', link: rootUrl, item: items, - }; + }); }; diff --git a/lib/v2/natgeo/dailyphoto.js b/lib/v2/natgeo/dailyphoto.js index 2a5c32848b..065dd8176b 100644 --- a/lib/v2/natgeo/dailyphoto.js +++ b/lib/v2/natgeo/dailyphoto.js @@ -1,15 +1,15 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); -const config = require('@/config').value; +import { config } from '@/config'; module.exports = async (ctx) => { const rootUrl = 'https://www.nationalgeographic.com'; const apiUrl = `${rootUrl}/photo-of-the-day`; const response = await ctx.cache.tryGet(apiUrl, async () => (await got(apiUrl)).data, config.cache.contentExpire, false); - const $ = cheerio.load(response); + const $ = load(response); const natgeo = JSON.parse($.html().match(/window\['__natgeo__']=(.*);/)[1]); const media = natgeo.page.content.mediaspotlight.frms[0].mods[0].edgs[1].media; @@ -24,9 +24,9 @@ module.exports = async (ctx) => { author: item.img.crdt, })); - ctx.state.data = { + ctx.set('data', { title: 'Nat Geo Photo of the Day', link: apiUrl, item: items, - }; + }); }; diff --git a/lib/v2/natgeo/dailyselection.js b/lib/v2/natgeo/dailyselection.js index d89add8d53..ded9bad7af 100644 --- a/lib/v2/natgeo/dailyselection.js +++ b/lib/v2/natgeo/dailyselection.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const host = 'http://dili.bdatu.com/jiekou/mains/p1.html'; @@ -19,7 +19,7 @@ module.exports = async (ctx) => { const api = 'http://dili.bdatu.com/jiekou/albums/a' + sort + '.html'; const response = await got(api); const items = response.data.picture; - const out = new Array(); + const out = []; items.map((item) => { const info = { @@ -33,9 +33,9 @@ module.exports = async (ctx) => { return info; }); - ctx.state.data = { + ctx.set('data', { title: 'Photo of the Daily Selection', link: api, item: out, - }; + }); }; diff --git a/lib/v2/natgeo/natgeo.js b/lib/v2/natgeo/natgeo.js index fed6fe9353..f58b6a21f9 100644 --- a/lib/v2/natgeo/natgeo.js +++ b/lib/v2/natgeo/natgeo.js @@ -1,12 +1,12 @@ -const cheerio = require('cheerio'); -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import { load } from 'cheerio'; +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; // https://www.natgeomedia.com//article/ -async function load(link) { +async function loadContent(link) { const { data } = await got(link); - const $ = cheerio.load(data); + const $ = load(data); const dtStr = $('.content-title-area') .find('h6') .first() @@ -26,10 +26,10 @@ async function load(link) { } module.exports = async (ctx) => { - const type = ctx.params.type ?? ''; - const url = `https://www.natgeomedia.com/${ctx.params.cat}/${type}`; + const type = ctx.req.param('type') ?? ''; + const url = `https://www.natgeomedia.com/${ctx.req.param('cat')}/${type}`; const res = await got(url); - const $ = cheerio.load(res.data); + const $ = load(res.data); const urlList = $('.article-link-w100') .find('.read-btn') @@ -44,13 +44,13 @@ module.exports = async (ctx) => { const single = { link, }; - const other = await ctx.cache.tryGet(link, () => load(link)); + const other = await ctx.cache.tryGet(link, () => loadContent(link)); return { ...single, ...other }; }) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: url, item: out, - }; + }); }; diff --git a/lib/v2/nationalgeographic/latest-stories.js b/lib/v2/nationalgeographic/latest-stories.js index 33ad9a927f..347671123c 100644 --- a/lib/v2/nationalgeographic/latest-stories.js +++ b/lib/v2/nationalgeographic/latest-stories.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const findNatgeo = ($) => @@ -14,7 +14,7 @@ const findNatgeo = ($) => module.exports = async (ctx) => { const currentUrl = 'https://www.nationalgeographic.com/pages/topic/latest-stories'; const response = await got(currentUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const items = await Promise.all( findNatgeo($) .page.content.hub.frms.flatMap((e) => e.mods) @@ -28,7 +28,7 @@ module.exports = async (ctx) => { .map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const mods = findNatgeo($).page.content.article.frms.find((f) => f.cmsType === 'ArticleBodyFrame').mods; const bodyTile = mods.find((m) => m.edgs[0].cmsType === 'ArticleBodyTile').edgs[0]; @@ -48,9 +48,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('meta[property="og:title"]').attr('content'), link: currentUrl, item: items.filter((item) => item !== null), - }; + }); }; diff --git a/lib/v2/nature/cover.js b/lib/v2/nature/cover.js index 93884bebd1..52a015db8c 100644 --- a/lib/v2/nature/cover.js +++ b/lib/v2/nature/cover.js @@ -14,9 +14,9 @@ // natastron: Nature Astronomy // nphys Nature Physics -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { baseUrl, journalMap } = require('./utils'); const { CookieJar } = require('tough-cookie'); @@ -44,7 +44,7 @@ module.exports = async (ctx) => { const imageUrl = `https://media.springernature.com/full/springer-static/cover-hires/journal/${id}/${volume}/${issue}?as=webp`; const contents = `
`; } -async function load(link) { +async function loadContent(link) { const response = await got(link); const data = response.data; - const $ = cheerio.load(data); // 使用 cheerio 加载返回的 HTML + const $ = load(data); // 使用 cheerio 加载返回的 HTML const description = $('.description').html(); return { @@ -45,7 +45,7 @@ async function loadNews(link) { const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); let description = $('.detail-body-container').html(); const date = $('.topics-articleHead__date').text(); description = description.replaceAll('src="/topics/', 'src="https://www.nintendo.com.hk/topics/'); @@ -58,7 +58,7 @@ async function loadNews(link) { const ProcessItem = (list, caches) => Promise.all( list.map(async (item) => { - const other = await caches.tryGet(item.link, () => load(item.link)); + const other = await caches.tryGet(item.link, () => loadContent(item.link)); return { ...item, ...other }; }) ); diff --git a/lib/v2/nippon/index.js b/lib/v2/nippon/index.js index 1f154c7916..a90bae6ab3 100644 --- a/lib/v2/nippon/index.js +++ b/lib/v2/nippon/index.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; module.exports = async (ctx) => { - const category = ctx.params.category ?? 'Politics'; + const category = ctx.req.param('category') ?? 'Politics'; const path = category === 'Science,Technology' ? 'condition4' : 'category_code'; const res = await got.get(`https://www.nippon.com/api/search/cn/${path}/20/1/${category}?t=${Date.now()}`); @@ -16,16 +16,16 @@ module.exports = async (ctx) => { list.slice(0, 10).map((item) => ctx.cache.tryGet(item.link, async () => { const res = await got.get(item.link); - const $ = cheerio.load(res.data); + const $ = load(res.data); item.description = $('.editArea').html(); return item; }) ) ); - ctx.state.data = { + ctx.set('data', { title: `走进日本 - ${category}`, link: 'https://www.nippon.com/cn/economy/', item, - }; + }); }; diff --git a/lib/v2/njglyy/utils/index.js b/lib/v2/njglyy/utils/index.js index afa1b215af..f875d0e438 100644 --- a/lib/v2/njglyy/utils/index.js +++ b/lib/v2/njglyy/utils/index.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; async function getNoticeList(ctx, url, host, listSelector, itemSelector, titleSelector, contentSelector) { const response = await got(url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $(listSelector) .toArray() @@ -25,7 +25,7 @@ async function getNoticeList(ctx, url, host, listSelector, itemSelector, titleSe item.link = response.redirectUrls[0]; item.description = '该通知无法直接预览，请点击原文链接↑查看'; } else { - const $ = cheerio.load(response.data); + const $ = load(response.data); item.title = $(contentSelector.title).text(); item.description = $(contentSelector.content) .html() diff --git a/lib/v2/njglyy/ygbjypx.js b/lib/v2/njglyy/ygbjypx.js index 7980635ff4..d277a97ed7 100644 --- a/lib/v2/njglyy/ygbjypx.js +++ b/lib/v2/njglyy/ygbjypx.js @@ -10,9 +10,9 @@ module.exports = async (ctx) => { date: 'span:contains("发布时间")', }); - ctx.state.data = { + ctx.set('data', { title: '南京鼓楼医院 -- 员工版教育培训', link: url, item: out, - }; + }); }; diff --git a/lib/v2/njit/jwc.js b/lib/v2/njit/jwc.js index 65c5b14288..8f4673127a 100644 --- a/lib/v2/njit/jwc.js +++ b/lib/v2/njit/jwc.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const host = 'https://jwc.njit.edu.cn'; module.exports = async (ctx) => { - const type = ctx.params.type ?? 'jx'; + const type = ctx.req.param('type') ?? 'jx'; const link = host + '/index/' + type + '.htm'; const response = await got({ method: 'get', @@ -14,7 +14,7 @@ module.exports = async (ctx) => { rejectUnauthorized: false, }, }); - const $ = cheerio.load(response.body); + const $ = load(response.body); const urlList = $('body') .find('ul li span a') @@ -52,7 +52,7 @@ module.exports = async (ctx) => { }; return single; } - const $ = cheerio.load(response.body); + const $ = load(response.body); const single = { title: $('title').text(), link: itemUrl, @@ -98,9 +98,9 @@ module.exports = async (ctx) => { info = '教学'; break; } - ctx.state.data = { + ctx.set('data', { title: '南京工程学院教务处 -- ' + info, link, item: out, - }; + }); }; diff --git a/lib/v2/njit/tzgg.js b/lib/v2/njit/tzgg.js index 5b26d5c293..509732cd2b 100644 --- a/lib/v2/njit/tzgg.js +++ b/lib/v2/njit/tzgg.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const url = 'https://www.njit.edu.cn/index/tzgg.htm'; const host = 'https://www.njit.edu.cn'; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { rejectUnauthorized: false, }, }); - const $ = cheerio.load(response.body); + const $ = load(response.body); const urlList = $('body') .find('span.text a') @@ -50,7 +50,7 @@ module.exports = async (ctx) => { rejectUnauthorized: false, }, }); - const $ = cheerio.load(response.body); + const $ = load(response.body); const single = { title: $('title').text(), link: itemUrl, @@ -66,9 +66,9 @@ module.exports = async (ctx) => { } }) ); - ctx.state.data = { + ctx.set('data', { title: '南京工程学院 -- 通知公告', url, item: out, - }; + }); }; diff --git a/lib/v2/njnu/ceai/ceai.js b/lib/v2/njnu/ceai/ceai.js index 6390a55ce7..ae303cf285 100644 --- a/lib/v2/njnu/ceai/ceai.js +++ b/lib/v2/njnu/ceai/ceai.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const util = require('./utils'); module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); let title, path; switch (type) { case 'xygg': @@ -29,16 +29,16 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('span a').get(); const result = await util.ProcessFeed(list, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: '南京师范大学计电人院 - ' + title, link: 'http://ceai.njnu.edu.cn/', description: '南京师范大学计电人院', item: result, - }; + }); }; diff --git a/lib/v2/njnu/ceai/utils.js b/lib/v2/njnu/ceai/utils.js index 1a9f2dd735..756543f7bd 100644 --- a/lib/v2/njnu/ceai/utils.js +++ b/lib/v2/njnu/ceai/utils.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; // 专门定义一个function用于加载文章内容 -async function load(link) { +async function loadContent(link) { // 异步请求文章 const response = await got.get(link, { https: { @@ -12,7 +12,7 @@ async function load(link) { }, }); // 加载文章内容 - const $ = cheerio.load(response.data); + const $ = load(response.data); const dateStr = $('#xw_xinxi span:nth-child(1)').text(); // 解析日期 const pubDate = timezone(parseDate(dateStr, 'YYYY-MM-DD', 'zh-cn'), +8); @@ -27,7 +27,7 @@ const ProcessFeed = (list, caches) => Promise.all( // 遍历每一篇文章 list.map(async (item) => { - const $ = cheerio.load(item); + const $ = load(item); const $title = $('a'); // 还原相对链接为绝对链接 @@ -43,7 +43,7 @@ const ProcessFeed = (list, caches) => // 使用tryGet方法从缓存获取内容。 // 当缓存中无法获取到链接内容的时候，则使用load方法加载文章内容。 - const other = await caches.tryGet(itemUrl, () => load(itemUrl)); + const other = await caches.tryGet(itemUrl, () => loadContent(itemUrl)); // 合并解析后的结果集作为该篇文章最终的输出结果 return { ...single, ...other }; diff --git a/lib/v2/njnu/jwc/jwc.js b/lib/v2/njnu/jwc/jwc.js index ae55a7d9c1..a76df84360 100644 --- a/lib/v2/njnu/jwc/jwc.js +++ b/lib/v2/njnu/jwc/jwc.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const util = require('./utils'); module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); let title, path; switch (type) { case 'jstz': @@ -28,16 +28,16 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.list_txt a').get(); const result = await util.ProcessFeed(list, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: '南京师范大学教务处 - ' + title, link: 'http://jwc.njnu.edu.cn/', description: '南京师范大学教务处', item: result, - }; + }); }; diff --git a/lib/v2/njnu/jwc/utils.js b/lib/v2/njnu/jwc/utils.js index a29366436f..579c7d0369 100644 --- a/lib/v2/njnu/jwc/utils.js +++ b/lib/v2/njnu/jwc/utils.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; // 专门定义一个function用于加载文章内容 -async function load(link) { +async function loadContent(link) { // 异步请求文章 const response = await got.get(link, { https: { @@ -12,7 +12,7 @@ async function load(link) { }, }); // 加载文章内容 - const $ = cheerio.load(response.data); + const $ = load(response.data); const dateStr = $('span+ span').text(); // 解析日期 const pubDate = timezone(parseDate(dateStr, 'YYYY-MM-DD', 'zh-cn'), +8); @@ -30,7 +30,7 @@ const ProcessFeed = (list, caches) => { return Promise.all( // 遍历每一篇文章 list.map(async (item) => { - const $ = cheerio.load(item); + const $ = load(item); const $title = $('a'); // 还原相对链接为绝对链接 @@ -46,7 +46,7 @@ const ProcessFeed = (list, caches) => { // 使用tryGet方法从缓存获取内容。 // 当缓存中无法获取到链接内容的时候，则使用load方法加载文章内容。 - const other = await caches.tryGet(itemUrl, () => load(itemUrl)); + const other = await caches.tryGet(itemUrl, () => loadContent(itemUrl)); // 合并解析后的结果集作为该篇文章最终的输出结果 return { ...single, ...other }; diff --git a/lib/v2/nju/admission.js b/lib/v2/nju/admission.js index 4866ba8150..c6fa09e4c5 100644 --- a/lib/v2/nju/admission.js +++ b/lib/v2/nju/admission.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const category_dict = { @@ -12,7 +12,7 @@ module.exports = async (ctx) => { const response = await got(`https://admission.nju.edu.cn/tzgg`); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); let script = $('ul').find('script'); script = script['1'].children[0].data; @@ -31,9 +31,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '本科迎新-通知公告', link: 'https://admission.nju.edu.cn/tzgg', item: items[0], - }; + }); }; diff --git a/lib/v2/nju/dafls.js b/lib/v2/nju/dafls.js index edfda534a2..86c4d1c4e8 100644 --- a/lib/v2/nju/dafls.js +++ b/lib/v2/nju/dafls.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const category_dict = { @@ -13,7 +13,7 @@ module.exports = async (ctx) => { const response = await got(`https://dafls.nju.edu.cn/13167/list.htm`); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('#article97'); // only read first page @@ -29,9 +29,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '大外部-通知公告', link: 'https://dafls.nju.edu.cn/13167/list.htm', item: [...items[0]], - }; + }); }; diff --git a/lib/v2/nju/exchangesys.js b/lib/v2/nju/exchangesys.js index a9ec4bccba..aad47c04a2 100644 --- a/lib/v2/nju/exchangesys.js +++ b/lib/v2/nju/exchangesys.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const dayjs = require('dayjs'); module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); const type_dict = { news: ['http://elite.nju.edu.cn/exchangesystem/index/moreList', 'http://elite.nju.edu.cn/exchangesystem/index/more?type=xw', '新闻通知'], proj: ['http://elite.nju.edu.cn/exchangesystem/index/moreXmList', 'http://elite.nju.edu.cn/exchangesystem/index/more?type=xm', '交换生项目'], @@ -16,7 +16,7 @@ module.exports = async (ctx) => { }, }); - ctx.state.data = { + ctx.set('data', { title: `本科生交换生管理系统-${type_dict[type][2]}`, link: type_dict[type][1], item: @@ -42,5 +42,5 @@ module.exports = async (ctx) => { } return null; }), - }; + }); }; diff --git a/lib/v2/nju/gra.js b/lib/v2/nju/gra.js index fc09613eb0..63ac6195cf 100644 --- a/lib/v2/nju/gra.js +++ b/lib/v2/nju/gra.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const response = await got({ @@ -11,10 +11,10 @@ module.exports = async (ctx) => { const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('li.news'); - ctx.state.data = { + ctx.set('data', { title: '研究生院-动态通知', link: 'https://grawww.nju.edu.cn/905/list.htm', item: list @@ -35,5 +35,5 @@ module.exports = async (ctx) => { }) .get() .filter(Boolean), - }; + }); }; diff --git a/lib/v2/nju/hosptial.js b/lib/v2/nju/hosptial.js index 2d7b9bb416..55ee68085d 100644 --- a/lib/v2/nju/hosptial.js +++ b/lib/v2/nju/hosptial.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const category_dict = { @@ -12,7 +12,7 @@ module.exports = async (ctx) => { const response = await got(`https://hospital.nju.edu.cn/ggtz/index.html`); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); let script = $('div .wrapper').find('script'); script = script['1'].children[0].data; @@ -31,9 +31,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '校医院-公告通知', link: 'https://hospital.nju.edu.cn/ggtz/index.html', item: items[0], - }; + }); }; diff --git a/lib/v2/nju/hqjt.js b/lib/v2/nju/hqjt.js index ea07e66bfa..a2d717a70f 100644 --- a/lib/v2/nju/hqjt.js +++ b/lib/v2/nju/hqjt.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const category_dict = { @@ -13,7 +13,7 @@ module.exports = async (ctx) => { const response = await got(`https://webplus.nju.edu.cn/_s25/zbcg/list.psp`); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('li.news'); // only read first page @@ -29,9 +29,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '后勤集团-招标采购', link: 'https://webplus.nju.edu.cn/_s25/zbcg/list.psp', item: [...items[0]], - }; + }); }; diff --git a/lib/v2/nju/itsc.js b/lib/v2/nju/itsc.js index 7e3f45a786..60d3932e93 100644 --- a/lib/v2/nju/itsc.js +++ b/lib/v2/nju/itsc.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const category_dict = { @@ -13,7 +13,7 @@ module.exports = async (ctx) => { const response = await got(`https://itsc.nju.edu.cn/tzgg/list.htm`); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const tmp = $('.list2')[0].children; const infos = []; for (const element of tmp) { @@ -36,9 +36,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: 'ITSC-公告通知', link: 'https://itsc.nju.edu.cn/tzgg/list.htm', item: items[0], - }; + }); }; diff --git a/lib/v2/nju/jjc.js b/lib/v2/nju/jjc.js index c9fffec4af..d4c6b5667e 100644 --- a/lib/v2/nju/jjc.js +++ b/lib/v2/nju/jjc.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const category_dict = { @@ -15,7 +15,7 @@ module.exports = async (ctx) => { const response = await got(`https://jjc.nju.edu.cn/${c}/list.htm`); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('#wp_news_w6').children().children().children(); // only read first page @@ -32,9 +32,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: `南京大学基建处`, link: 'https://jjc.nju.edu.cn/main.htm', item: [...items[0], ...items[1], ...items[2]], - }; + }); }; diff --git a/lib/v2/nju/jw.js b/lib/v2/nju/jw.js index bf41f5ab16..280da4ea78 100644 --- a/lib/v2/nju/jw.js +++ b/lib/v2/nju/jw.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); const type_dict = { ggtz: [ 26263, // columnID @@ -37,7 +37,7 @@ module.exports = async (ctx) => { }, }); - ctx.state.data = { + ctx.set('data', { title: `本科生院-${type_dict[type][1]}`, link: type_dict[type][4], item: @@ -55,5 +55,5 @@ module.exports = async (ctx) => { } return ret; }), - }; + }); }; diff --git a/lib/v2/nju/rczp.js b/lib/v2/nju/rczp.js index 69f47f22c8..31431d8e95 100644 --- a/lib/v2/nju/rczp.js +++ b/lib/v2/nju/rczp.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const config = require('@/config').value; +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { config } from '@/config'; module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); const title_dict = { xxfb: { title: '信息发布', channelid: '9531,9532,9533,9534,9535,9419' }, jylgw: { title: '教研类岗位', channelid: '9420,9421,9422,9423' }, @@ -40,9 +40,9 @@ module.exports = async (ctx) => { author: item.username, })); - ctx.state.data = { + ctx.set('data', { title: `人才招聘-${title_dict[type].title}`, link, item: items, - }; + }); }; diff --git a/lib/v2/nju/scit.js b/lib/v2/nju/scit.js index bc4f67dc4d..0594892d8d 100644 --- a/lib/v2/nju/scit.js +++ b/lib/v2/nju/scit.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); const type_dict = { tzgg: ['https://scit.nju.edu.cn/10916/list.htm', '通知公告'], kydt: ['https://scit.nju.edu.cn/11003/list.htm', '科研动态'], @@ -16,10 +16,10 @@ module.exports = async (ctx) => { const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('li.list_item'); - ctx.state.data = { + ctx.set('data', { title: `科学技术处-${type_dict[type][1]}`, link: type_dict[type][0], item: list @@ -32,5 +32,5 @@ module.exports = async (ctx) => { }; }) .get(), - }; + }); }; diff --git a/lib/v2/nju/zbb.js b/lib/v2/nju/zbb.js index baa4472a20..31f1a93ef1 100644 --- a/lib/v2/nju/zbb.js +++ b/lib/v2/nju/zbb.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); if (type === 'zfcgyxgk') { const url = `https://zbb.nju.edu.cn/zfcgyxgk/index.chtml`; @@ -15,7 +15,7 @@ module.exports = async (ctx) => { const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('dd[cid]'); ctx.state.data = { @@ -52,7 +52,7 @@ module.exports = async (ctx) => { }); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('dd[cid]'); return list diff --git a/lib/v2/nju/zcc.js b/lib/v2/nju/zcc.js index dfe31cf0bc..e3c95b6d90 100644 --- a/lib/v2/nju/zcc.js +++ b/lib/v2/nju/zcc.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const category_dict = { ggtz: '公告通知', @@ -11,7 +11,7 @@ module.exports = async (ctx) => { const response = await got(`https://zcc.nju.edu.cn/sy/tzzhxx/index.html`); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); let script = $('ul.clearfix').find('script'); script = script['1'].children[0].data; @@ -30,9 +30,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '资产管理处-公告通知', link: 'https://zcc.nju.edu.cn/sy/tzzhxx/index.html', item: items[0], - }; + }); }; diff --git a/lib/v2/njucm/grabs.js b/lib/v2/njucm/grabs.js index e454a07b7d..b1a728ef27 100644 --- a/lib/v2/njucm/grabs.js +++ b/lib/v2/njucm/grabs.js @@ -10,9 +10,9 @@ module.exports = async (ctx) => { date: '.Article_PublishDate', }); - ctx.state.data = { + ctx.set('data', { title: '南京中医药大学 -- 博士招生', link: url, item: out, - }; + }); }; diff --git a/lib/v2/njucm/utils/index.js b/lib/v2/njucm/utils/index.js index ef1327034a..641b1fb125 100644 --- a/lib/v2/njucm/utils/index.js +++ b/lib/v2/njucm/utils/index.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; async function getNoticeList(ctx, url, host, listSelector, titleSelector, contentSelector) { const response = await got(url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $(listSelector) .toArray() @@ -25,7 +25,7 @@ async function getNoticeList(ctx, url, host, listSelector, titleSelector, conten item.link = response.redirectUrls[0]; item.description = '该通知无法直接预览，请点击原文链接↑查看'; } else { - const $ = cheerio.load(response.data); + const $ = load(response.data); item.title = $(contentSelector.title).text(); item.description = $(contentSelector.content) .html() diff --git a/lib/v2/njupt/jwc.js b/lib/v2/njupt/jwc.js index 597a1330a8..b0a1cf47c4 100644 --- a/lib/v2/njupt/jwc.js +++ b/lib/v2/njupt/jwc.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const host = 'https://jwc.njupt.edu.cn'; @@ -10,7 +10,7 @@ const map = { }; module.exports = async (ctx) => { - const type = ctx.params.type ?? 'notice'; + const type = ctx.req.param('type') ?? 'notice'; const link = host + map[type] + '/list.htm'; const response = await got({ method: 'get', @@ -19,7 +19,7 @@ module.exports = async (ctx) => { Referer: host, }, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const urlList = $('.content') .find('a') @@ -54,7 +54,7 @@ module.exports = async (ctx) => { }; return single; } - const $ = cheerio.load(response.data); + const $ = load(response.data); const single = { title: $('.Article_Title').text(), link: itemUrl, @@ -82,9 +82,9 @@ module.exports = async (ctx) => { if (type === 'news') { info = '教务快讯'; } - ctx.state.data = { + ctx.set('data', { title: '南京邮电大学 -- ' + info, link, item: out, - }; + }); }; diff --git a/lib/v2/njust/cwc.js b/lib/v2/njust/cwc.js index d945908e1e..6e50f58798 100644 --- a/lib/v2/njust/cwc.js +++ b/lib/v2/njust/cwc.js @@ -1,6 +1,6 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { getContent } = require('./utils'); const map = new Map([ @@ -11,7 +11,7 @@ const map = new Map([ const host = 'https://cwc.njust.edu.cn'; module.exports = async (ctx) => { - const type = ctx.params.type ?? 'tzgg'; + const type = ctx.req.param('type') ?? 'tzgg'; const info = map.get(type); if (!info) { throw new Error('invalid type'); @@ -20,10 +20,10 @@ module.exports = async (ctx) => { const siteUrl = host + id + '/list.htm'; const html = await getContent(siteUrl, true); - const $ = cheerio.load(html); + const $ = load(html); const list = $('ul.news_list').find('li'); - ctx.state.data = { + ctx.set('data', { title: info.title, link: siteUrl, item: @@ -35,5 +35,5 @@ module.exports = async (ctx) => { link: $(item).find('a').attr('href'), })) .get(), - }; + }); }; diff --git a/lib/v2/njust/dgxg.js b/lib/v2/njust/dgxg.js index f988ee7e3e..9a618855a7 100644 --- a/lib/v2/njust/dgxg.js +++ b/lib/v2/njust/dgxg.js @@ -1,6 +1,6 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { getContent } = require('./utils'); const map = new Map([ @@ -12,7 +12,7 @@ const map = new Map([ const host = 'https://dgxg.njust.edu.cn'; module.exports = async (ctx) => { - const type = ctx.params.type ?? 'gstz'; + const type = ctx.req.param('type') ?? 'gstz'; const info = map.get(type); if (!info) { throw new Error('invalid type'); @@ -21,10 +21,10 @@ module.exports = async (ctx) => { const siteUrl = host + id + '/list.htm'; const html = await getContent(siteUrl, true); - const $ = cheerio.load(html); + const $ = load(html); const list = $('ul.wp_article_list').find('li'); - ctx.state.data = { + ctx.set('data', { title: info.title, link: siteUrl, item: @@ -36,5 +36,5 @@ module.exports = async (ctx) => { link: $(item).find('a').attr('href'), })) .get(), - }; + }); }; diff --git a/lib/v2/njust/eo.js b/lib/v2/njust/eo.js index 6ef358a7da..fde04df4f9 100644 --- a/lib/v2/njust/eo.js +++ b/lib/v2/njust/eo.js @@ -1,6 +1,6 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { getContent } = require('./utils'); const map = new Map([ @@ -17,8 +17,8 @@ const map = new Map([ const host = 'https://dgxg.njust.edu.cn'; module.exports = async (ctx) => { - const grade = ctx.params.grade ?? '17'; - const type = ctx.params.type ?? 'tz'; + const grade = ctx.req.param('grade') ?? '17'; + const type = ctx.req.param('type') ?? 'tz'; let info = map.get(grade + type); if (!info) { // throw new Error('invalid type'); @@ -28,13 +28,13 @@ module.exports = async (ctx) => { const siteUrl = host + id + '/list.htm'; const html = await getContent(siteUrl, true); - const $ = cheerio.load(html); + const $ = load(html); if (!info.title) { info.title = $('title').text(); } const list = $('li.list_item'); - ctx.state.data = { + ctx.set('data', { title: info.title, link: siteUrl, item: @@ -46,5 +46,5 @@ module.exports = async (ctx) => { link: $(item).find('a').attr('href'), })) .get(), - }; + }); }; diff --git a/lib/v2/njust/eoe.js b/lib/v2/njust/eoe.js index eebcb16b2e..8495d1e3a3 100644 --- a/lib/v2/njust/eoe.js +++ b/lib/v2/njust/eoe.js @@ -1,6 +1,6 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { getContent } = require('./utils'); const map = new Map([ @@ -11,7 +11,7 @@ const map = new Map([ const host = 'https://eoe.njust.edu.cn'; module.exports = async (ctx) => { - const type = ctx.params.type ?? 'tzgg'; + const type = ctx.req.param('type') ?? 'tzgg'; const info = map.get(type); if (!info) { throw new Error('invalid type'); @@ -20,10 +20,10 @@ module.exports = async (ctx) => { const siteUrl = host + id + '/list.htm'; const html = await getContent(siteUrl, true); - const $ = cheerio.load(html); + const $ = load(html); const list = $('ul.news_ul').find('li'); - ctx.state.data = { + ctx.set('data', { title: info.title, link: siteUrl, item: @@ -35,5 +35,5 @@ module.exports = async (ctx) => { link: $(item).find('a').attr('href'), })) .get(), - }; + }); }; diff --git a/lib/v2/njust/gs.js b/lib/v2/njust/gs.js index 47c3bf0851..4e3d54e35f 100644 --- a/lib/v2/njust/gs.js +++ b/lib/v2/njust/gs.js @@ -1,17 +1,17 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { getContent } = require('./utils'); const host = 'https://gs.njust.edu.cn'; module.exports = async (ctx) => { - const type = ctx.params.type ?? 'sytzgg_4568'; + const type = ctx.req.param('type') ?? 'sytzgg_4568'; const id = '/' + type; const siteUrl = host + id + '/list.htm'; const html = await getContent(siteUrl); - const $ = cheerio.load(html); + const $ = load(html); const title = '南京理工大学研究生院 -- ' + $('title').text(); const list = $('ul.news_ul').find('li'); @@ -21,7 +21,7 @@ module.exports = async (ctx) => { let desc = ''; if (url.startsWith('/')) { const data = await getContent(host + url); - desc = cheerio.load(data)('.wp_articlecontent').html(); + desc = load(data)('.wp_articlecontent').html(); } return { @@ -33,9 +33,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title, link: siteUrl, item: items, - }; + }); }; diff --git a/lib/v2/njust/jwc.js b/lib/v2/njust/jwc.js index 6053e115a1..213bf81c5d 100644 --- a/lib/v2/njust/jwc.js +++ b/lib/v2/njust/jwc.js @@ -1,6 +1,6 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { getContent } = require('./utils'); const map = new Map([ @@ -13,7 +13,7 @@ const map = new Map([ const host = 'https://jwc.njust.edu.cn'; module.exports = async (ctx) => { - const type = ctx.params.type ?? 'xstz'; + const type = ctx.req.param('type') ?? 'xstz'; const info = map.get(type); if (!info) { throw new Error('invalid type'); @@ -22,10 +22,10 @@ module.exports = async (ctx) => { const siteUrl = host + id + '/list.htm'; const html = await getContent(siteUrl, true); - const $ = cheerio.load(html); + const $ = load(html); const list = $('div#wp_news_w3').find('tr'); - ctx.state.data = { + ctx.set('data', { title: info.title, link: siteUrl, item: @@ -37,5 +37,5 @@ module.exports = async (ctx) => { link: $(item).find('a').attr('href'), })) .get(), - }; + }); }; diff --git a/lib/v2/njust/utils.js b/lib/v2/njust/utils.js index a5af29ea08..957ac2a79c 100644 --- a/lib/v2/njust/utils.js +++ b/lib/v2/njust/utils.js @@ -1,6 +1,9 @@ +import got from '@/utils/got'; +import puppeteer from '@/utils/puppeteer'; + async function getContent(url, pptr = false) { if (pptr) { - const browser = await require('@/utils/puppeteer')({ stealth: true }); + const browser = puppeteer({ stealth: true }); try { const page = await browser.newPage(); // 更改 window.navigator.webdriver 值以避开反爬 @@ -23,7 +26,6 @@ async function getContent(url, pptr = false) { browser.close(); } } else { - const got = require('@/utils/got'); const response = await got(url); const data = response.data; return data; diff --git a/lib/v2/njxzc/home.js b/lib/v2/njxzc/home.js index 28df465d87..049d00b085 100644 --- a/lib/v2/njxzc/home.js +++ b/lib/v2/njxzc/home.js @@ -18,9 +18,9 @@ module.exports = async (ctx) => { '.news_list .news' ); - ctx.state.data = { + ctx.set('data', { title: '南京晓庄学院 -- 通知公告', link: url, item: out, - }; + }); }; diff --git a/lib/v2/njxzc/lib.js b/lib/v2/njxzc/lib.js index bdf482cd5d..583b28389e 100644 --- a/lib/v2/njxzc/lib.js +++ b/lib/v2/njxzc/lib.js @@ -18,9 +18,9 @@ module.exports = async (ctx) => { '.news' ); - ctx.state.data = { + ctx.set('data', { title: '南京晓庄学院 -- 图书馆通知公告', link: url, item: out, - }; + }); }; diff --git a/lib/v2/njxzc/utils/index.js b/lib/v2/njxzc/utils/index.js index 7a0764ec99..3984c10349 100644 --- a/lib/v2/njxzc/utils/index.js +++ b/lib/v2/njxzc/utils/index.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; async function getNoticeList(ctx, url, host, titleSelector, dateSelector, contentSelector, listSelector) { const response = await got(url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $(listSelector) .toArray() @@ -26,7 +26,7 @@ async function getNoticeList(ctx, url, host, titleSelector, dateSelector, conten item.link = response.redirectUrls[0]; item.description = '该通知无法直接预览，请点击原文链接↑查看'; } else { - const $ = cheerio.load(response.data); + const $ = load(response.data); item.title = $(contentSelector.title).text(); item.description = $(contentSelector.content) .html() diff --git a/lib/v2/nltimes/news.js b/lib/v2/nltimes/news.js index 30eb08d970..8aed1e82cf 100644 --- a/lib/v2/nltimes/news.js +++ b/lib/v2/nltimes/news.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const map = new Map([ ['top-stories', { title: 'NL Times -- Top Stories', suffix: '/top-stories' }], @@ -17,7 +17,7 @@ const map = new Map([ ]); module.exports = async (ctx) => { - const category = ctx.params.category ?? 'top-stories'; + const category = ctx.req.param('category') ?? 'top-stories'; const suffix = map.get(category).suffix; const rootUrl = 'https://www.nltimes.nl'; @@ -28,7 +28,7 @@ module.exports = async (ctx) => { url: apiUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.news-card') .slice(0, 10) @@ -49,7 +49,7 @@ module.exports = async (ctx) => { .get(); const ProcessFeed = (data) => { - const $ = cheerio.load(data); + const $ = load(data); return $('.news-article--body').html(); }; @@ -79,11 +79,11 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: map.get(category).title, language: 'en', link: apiUrl, description: map.get(category).title, item: items, - }; + }); }; diff --git a/lib/v2/nmtv/column.js b/lib/v2/nmtv/column.js index 43d30c8c73..0beb9a1501 100644 --- a/lib/v2/nmtv/column.js +++ b/lib/v2/nmtv/column.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { - const id = ctx.params.id ?? '877'; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 100; + const id = ctx.req.param('id') ?? '877'; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 100; const hostUrl = 'https://vod.m2oplus.nmtv.cn'; const apiRootUrl = 'https://mapi.m2oplus.nmtv.cn'; @@ -43,11 +43,11 @@ module.exports = async (ctx) => { const author = data[0].column_name; const imageUrl = data[0].column_info.indexpic; - ctx.state.data = { + ctx.set('data', { title: `内蒙古广播电视台 - ${author}`, link: items[0].link.split(/\/\d{4}-\d{2}-\d{2}\//)[0], item: items, image: `${imageUrl.host}${imageUrl.filepath}${imageUrl.filename}`, itunes_author: author, - }; + }); }; diff --git a/lib/v2/nodejs/blog.js b/lib/v2/nodejs/blog.js index bc63af5c20..c557d2bd69 100644 --- a/lib/v2/nodejs/blog.js +++ b/lib/v2/nodejs/blog.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const language = ctx.params.language ?? 'en'; + const language = ctx.req.param('language') ?? 'en'; const rootUrl = 'https://nodejs.org'; const currentUrl = `${rootUrl}/${language}/blog`; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); $('.summary').remove(); @@ -36,7 +36,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.pubDate = parseDate(content('time').attr('datetime')); item.author = content('.blogpost-meta') @@ -52,9 +52,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'News - Node.js', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/nogizaka46/blog.js b/lib/v2/nogizaka46/blog.js index d02b8ee996..21022789c1 100644 --- a/lib/v2/nogizaka46/blog.js +++ b/lib/v2/nogizaka46/blog.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const rootUrl = 'https://www.nogizaka46.com'; module.exports = async (ctx) => { - const id = ctx.params.id ?? 'all'; + const id = ctx.req.param('id') ?? 'all'; const params = id === 'all' ? '' : `?ct=${id}`; const currentUrl = `${rootUrl}/s/n46/api/list/blog${params}`; @@ -15,7 +15,7 @@ module.exports = async (ctx) => { const list = JSON.parse(response.data.slice(4).slice(0, -2)).data; - ctx.state.data = { + ctx.set('data', { allowEmpty: true, title: '乃木坂46 公式ブログ', link: 'https://www.nogizaka46.com/s/n46/diary/MEMBER', @@ -29,5 +29,5 @@ module.exports = async (ctx) => { description: item.text, guid: rootUrl + new URL(item.link).pathname, })), - }; + }); }; diff --git a/lib/v2/nogizaka46/news.js b/lib/v2/nogizaka46/news.js index 15a5afec76..b68d96e035 100644 --- a/lib/v2/nogizaka46/news.js +++ b/lib/v2/nogizaka46/news.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const rootUrl = 'https://www.nogizaka46.com'; module.exports = async (ctx) => { - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 25; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 25; const response = await got({ method: 'get', @@ -24,10 +24,10 @@ module.exports = async (ctx) => { guid: rootUrl + new URL(item.link_url).pathname, })); - ctx.state.data = { + ctx.set('data', { allowEmpty: true, title: '乃木坂46官网 NEWS', link: 'http://www.nogizaka46.com/news/', item: items, - }; + }); }; diff --git a/lib/v2/notateslaapp/update.js b/lib/v2/notateslaapp/update.js index 9ba8338554..e51e0daffe 100644 --- a/lib/v2/notateslaapp/update.js +++ b/lib/v2/notateslaapp/update.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; module.exports = async (ctx) => { const response = await got({ @@ -12,10 +12,10 @@ module.exports = async (ctx) => { const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('article[id]'); - ctx.state.data = { + ctx.set('data', { title: '特斯拉系统更新', link: 'https://www.notateslaapp.com/software-updates/history/', description: '特斯拉系统更新 - 最新发布', @@ -32,5 +32,5 @@ module.exports = async (ctx) => { }; }) .get(), - }; + }); }; diff --git a/lib/v2/notefolio/search.js b/lib/v2/notefolio/search.js index f204576d72..25ac07eb2e 100644 --- a/lib/v2/notefolio/search.js +++ b/lib/v2/notefolio/search.js @@ -1,9 +1,9 @@ // 导入所需模组 -const got = require('@/utils/got'); // 自订的 got -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; // 自订的 got +import { parseDate } from '@/utils/parse-date'; const dayjs = require('dayjs'); const path = require('path'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; // 分类 const categoryMap = [ @@ -133,12 +133,12 @@ module.exports = async (ctx) => { }; }) || []; - ctx.state.data = { + ctx.set('data', { // 源标题 title: `${category}/${order}/${time}/${query} search`, // 源链接 // link: '', // 源文章 item: items, - }; + }); }; diff --git a/lib/v2/notion/database.js b/lib/v2/notion/database.js index e96035e7ec..1218036eda 100644 --- a/lib/v2/notion/database.js +++ b/lib/v2/notion/database.js @@ -1,10 +1,10 @@ const { Client, isNotionClientError, APIErrorCode } = require('@notionhq/client'); const logger = require('@/utils/logger'); -const config = require('@/config').value; -const { parseDate } = require('@/utils/parse-date'); -const got = require('@/utils/got'); +import { config } from '@/config'; +import { parseDate } from '@/utils/parse-date'; +import got from '@/utils/got'; const { NotionToMarkdown } = require('notion-to-md'); -const cheerio = require('cheerio'); +import { load } from 'cheerio'; const md = require('markdown-it')({ html: true, linkify: true, @@ -15,7 +15,7 @@ module.exports = async (ctx) => { throw new Error('Notion RSS is disabled due to the lack of NOTION_TOKEN(relevant config)'); } - const databaseId = ctx.params.databaseId; + const databaseId = ctx.req.param('databaseId'); const notion_api_key = config.notion.key; const notion = new Client({ @@ -31,12 +31,12 @@ module.exports = async (ctx) => { const image = database.cover?.external.url ?? database.icon?.emoji; // List pages under the database - const databaseQuery = parseCustomQuery(ctx.query.query); + const databaseQuery = parseCustomQuery(ctx.req.query('query')); const { results } = await notion.databases.query({ database_id: databaseId, ...databaseQuery, }); - const customProperties = parseCustomQuery(ctx.query.properties) ?? {}; + const customProperties = parseCustomQuery(ctx.req.query('properties')) ?? {}; const properties = { author: customProperties.author ?? 'Author', link: customProperties.link ?? 'URL', @@ -74,7 +74,7 @@ module.exports = async (ctx) => { method: 'get', url: articleLink, }); - const $ = cheerio.load(response.body); + const $ = load(response.body); const articleAuthor = $('meta[name="author"]').attr('content'); const articlePubTime = $('meta[name="publish_date"], meta[name="date"]').attr('content'); return { @@ -118,9 +118,9 @@ module.exports = async (ctx) => { if (isNotionClientError(error)) { if (error.statusCode === APIErrorCode.ObjectNotFound) { - ctx.throw(404, 'The database is not exist'); + throw new Error('The database is not exist'); } else if (error.statusCode === APIErrorCode.Unauthorized) { - ctx.throw(401, 'Please check the config of NOTION_TOKEN'); + throw new Error('Please check the config of NOTION_TOKEN'); } else { ctx.throw(error.statusCode, 'Notion API Error'); } diff --git a/lib/v2/now/news.js b/lib/v2/now/news.js index a41e116764..4b189ee993 100644 --- a/lib/v2/now/news.js +++ b/lib/v2/now/news.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const categories = { tracker: 123, @@ -9,8 +9,8 @@ const categories = { }; module.exports = async (ctx) => { - const category = ctx.params.category || ''; - const id = ctx.params.id || ''; + const category = ctx.req.param('category') || ''; + const id = ctx.req.param('id') || ''; const rootUrl = 'https://news.now.com'; @@ -21,7 +21,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $(`${category === '' ? '.homeFeaturedNews ' : '.newsCategoryColLeft '}.newsTitle`) .map((_, item) => { @@ -41,7 +41,7 @@ module.exports = async (ctx) => { method: 'get', url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); const images = detailResponse.data.match(/"imageUrl":"(.*?)","image2Url":/); @@ -53,9 +53,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: String(Object.hasOwn(categories, category) ? $('title').text() : ($('.smallSpace.active').text() || '首頁') + ' | Now 新聞'), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/nowcoder/discuss.js b/lib/v2/nowcoder/discuss.js index de495da57a..090a19e2ef 100644 --- a/lib/v2/nowcoder/discuss.js +++ b/lib/v2/nowcoder/discuss.js @@ -1,17 +1,17 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const host = 'https://www.nowcoder.com'; module.exports = async (ctx) => { - const type = ctx.params.type; - const order = ctx.params.order; + const type = ctx.req.param('type'); + const order = ctx.req.param('order'); const link = `https://www.nowcoder.com/discuss?type=${type}&order=${order}`; const response = await got.get(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const type_name = $('a.discuss-tab.selected').text(); const order_name = $('li.selected a').text(); @@ -33,7 +33,7 @@ module.exports = async (ctx) => { return ctx.cache.tryGet(itemUrl, async () => { const response = await got.get(itemUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const date_value = $('span.post-time').text(); @@ -49,9 +49,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: `${type_name}${order_name}——牛客网讨论区`, link, item: out, - }; + }); }; diff --git a/lib/v2/nowcoder/experience.js b/lib/v2/nowcoder/experience.js index ea814662c0..0da57ab346 100644 --- a/lib/v2/nowcoder/experience.js +++ b/lib/v2/nowcoder/experience.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const host = 'https://www.nowcoder.com'; module.exports = async (ctx) => { const params = new URLSearchParams(ctx.query); - params.append('tagId', ctx.params.tagId); + params.append('tagId', ctx.req.param('tagId')); const link = new URL('/discuss/experience/json', host); @@ -31,7 +31,7 @@ module.exports = async (ctx) => { list.map((info) => ctx.cache.tryGet(info.link, async () => { const response = await got.get(info.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); info.description = $('.nc-post-content').html(); @@ -40,9 +40,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { - title: `牛客面经Tag${ctx.params.tagId}`, + ctx.set('data', { + title: `牛客面经Tag${ctx.req.param('tagId')}`, link: link.href, item: out, - }; + }); }; diff --git a/lib/v2/nowcoder/jobcenter.js b/lib/v2/nowcoder/jobcenter.js index 1469a33bdf..50bec560dc 100644 --- a/lib/v2/nowcoder/jobcenter.js +++ b/lib/v2/nowcoder/jobcenter.js @@ -1,17 +1,17 @@ const url = require('url'); -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; module.exports = async (ctx) => { const rootUrl = `https://www.nowcoder.com/job/center/`; - const currentUrl = `${rootUrl}?${ctx.params.type ? 'type=' + ctx.params.type : ''}${ctx.params.city ? '&city=' + ctx.params.city : ''}${ctx.params.order ? '&order=' + ctx.params.order : ''}${ - ctx.params.recruitType ? '&recruitType=' + ctx.params.recruitType : '' - }${ctx.params.latest ? '&latest=' + ctx.params.latest : ''}`; + const currentUrl = `${rootUrl}?${ctx.req.param('type') ? 'type=' + ctx.req.param('type') : ''}${ctx.req.param('city') ? '&city=' + ctx.req.param('city') : ''}${ctx.req.param('order') ? '&order=' + ctx.req.param('order') : ''}${ + ctx.req.param('recruitType') ? '&recruitType=' + ctx.req.param('recruitType') : '' + }${ctx.req.param('latest') ? '&latest=' + ctx.req.param('latest') : ''}`; const response = await got({ method: 'get', url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('ul.reco-job-list li') .slice(0, 30) .map((_, item) => { @@ -42,16 +42,16 @@ module.exports = async (ctx) => { method: 'get', url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('div.rec-job').html(); return item; }) ) ); - ctx.state.data = { - title: `${ctx.params.recruitType ? (ctx.params.recruitType === '2' ? '社招广场' : '实习广场') : '实习广场'} - 牛客网`, + ctx.set('data', { + title: `${ctx.req.param('recruitType') ? (ctx.req.param('recruitType') === '2' ? '社招广场' : '实习广场') : '实习广场'} - 牛客网`, link: rootUrl, item: items, - }; + }); }; diff --git a/lib/v2/nowcoder/recommend.js b/lib/v2/nowcoder/recommend.js index 84b70e788d..da43c5a16e 100644 --- a/lib/v2/nowcoder/recommend.js +++ b/lib/v2/nowcoder/recommend.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; module.exports = async (ctx) => { const link = `https://www.nowcoder.com/recommand/activity?token=&type=3&_=${Date.now()}`; @@ -7,7 +7,7 @@ module.exports = async (ctx) => { throw new Error(`接口错误，错误代码:${responseBody.code},错误原因:${responseBody.msg}`); } const data = responseBody.data.activitys; - ctx.state.data = { + ctx.set('data', { title: '牛客网-推荐', link: 'https://www.nowcoder.com/recommend', description: '牛客网-推荐', @@ -16,5 +16,5 @@ module.exports = async (ctx) => { description: `
查看原文'; } }); @@ -70,10 +70,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: map.get(type).title, link, description: '南京航空航天大学自动化学院RSS', item: out, - }; + }); }; diff --git a/lib/v2/nuaa/college/cs.js b/lib/v2/nuaa/college/cs.js index d792bcdc62..a84c9f001a 100644 --- a/lib/v2/nuaa/college/cs.js +++ b/lib/v2/nuaa/college/cs.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const getCookie = require('../utils/pypasswaf'); const host = 'https://cs.nuaa.edu.cn/'; @@ -15,8 +15,8 @@ const map = new Map([ ]); module.exports = async (ctx) => { - const type = ctx.params.type; - const getDescription = Boolean(ctx.params.getDescription) || false; + const type = ctx.req.param('type'); + const getDescription = Boolean(ctx.req.param('getDescription')) || false; const suffix = map.get(type).suffix; const link = new URL(suffix, host).href; @@ -27,7 +27,7 @@ module.exports = async (ctx) => { }, }; const response = await got(link, gotConfig); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('#news_list ul li') .slice(0, Math.min(Number.parseInt($('.per_count', '#wp_paging_w6').text()), Number.parseInt($('.all_count', '#wp_paging_w6').slice(1).text()))) @@ -54,7 +54,7 @@ module.exports = async (ctx) => { const pageType = arr.at(-1); if (pageType === 'htm' || pageType === 'html') { const response = await got(itemUrl, gotConfig); - const $ = cheerio.load(response.data); + const $ = load(response.data); return $('.wp_articlecontent').html() + '
查看原文'; } }); @@ -69,10 +69,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: map.get(type).title, link, description: '南京航空航天大学计算机科学与技术学院RSS', item: out, - }; + }); }; diff --git a/lib/v2/nuaa/jwc/jwc.js b/lib/v2/nuaa/jwc/jwc.js index 96e5b85ba5..7f58a076b9 100644 --- a/lib/v2/nuaa/jwc/jwc.js +++ b/lib/v2/nuaa/jwc/jwc.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const getCookie = require('../utils/pypasswaf'); const host = 'http://aao.nuaa.edu.cn/'; @@ -13,9 +13,9 @@ const map = new Map([ ]); module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); const suffix = map.get(type).suffix; - const getDescription = Boolean(ctx.params.getDescription) || false; + const getDescription = Boolean(ctx.req.param('getDescription')) || false; const link = new URL(suffix, host).href; const cookie = await getCookie(host); @@ -25,7 +25,7 @@ module.exports = async (ctx) => { }, }; const response = await got(link, gotConfig); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('#wp_news_w8 ul li') .slice(0, 10) @@ -52,7 +52,7 @@ module.exports = async (ctx) => { const pageType = arr.at(-1); if (pageType === 'htm' || pageType === 'html') { const response = await got(itemUrl, gotConfig); - const $ = cheerio.load(response.data); + const $ = load(response.data); return $('.wp_articlecontent').html() + '
查看原文'; } }); @@ -67,10 +67,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: map.get(type).title, link, description: '南京航空航天大学教务处RSS', item: out, - }; + }); }; diff --git a/lib/v2/nuaa/utils/pypasswaf.js b/lib/v2/nuaa/utils/pypasswaf.js index c17cc443f9..d8840dde5a 100644 --- a/lib/v2/nuaa/utils/pypasswaf.js +++ b/lib/v2/nuaa/utils/pypasswaf.js @@ -1,11 +1,12 @@ const puppeteerUtils = require('@/utils/puppeteer-utils'); +import puppeteer from '@/utils/puppeteer'; /** * async function 获取cookie * @desc 返回一个可用的cookie，使用 `got` 发起请求的时候，传入到`options.headers.cookie`即可 */ module.exports = async function getCookie(host) { - const browser = await require('@/utils/puppeteer')({ stealth: true }); + const browser = puppeteer({ stealth: true }); const page = await browser.newPage(); await page.setRequestInterception(true); page.on('request', (request) => { diff --git a/lib/v2/nuaa/yjsy/yjsy.js b/lib/v2/nuaa/yjsy/yjsy.js index 4b004706f0..0532c8509a 100644 --- a/lib/v2/nuaa/yjsy/yjsy.js +++ b/lib/v2/nuaa/yjsy/yjsy.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const getCookie = require('../utils/pypasswaf'); const host = 'http://www.graduate.nuaa.edu.cn/'; @@ -12,9 +12,9 @@ const map = new Map([ ]); module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); const suffix = map.get(type).suffix; - const getDescription = Boolean(ctx.params.getDescription) || false; + const getDescription = Boolean(ctx.req.param('getDescription')) || false; const link = new URL(suffix, host).href; const cookie = await getCookie(host); const gotConfig = { @@ -23,7 +23,7 @@ module.exports = async (ctx) => { }, }; const response = await got(link, gotConfig); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('#wp_news_w6 ul li') .slice(0, 10) @@ -50,7 +50,7 @@ module.exports = async (ctx) => { const pageType = arr.at(-1); if (pageType === 'htm' || pageType === 'html') { const response = await got(itemUrl, gotConfig); - const $ = cheerio.load(response.data); + const $ = load(response.data); return $('.wp_articlecontent').html() + '
查看原文'; } }); @@ -65,10 +65,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: map.get(type).title, link, description: '南京航空航天大学研究生院RSS', item: out, - }; + }); }; diff --git a/lib/v2/nuist/bulletin.js b/lib/v2/nuist/bulletin.js index db6a45d7a0..8f10769e00 100644 --- a/lib/v2/nuist/bulletin.js +++ b/lib/v2/nuist/bulletin.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseTitle = '南信大信息公告栏'; const baseUrl = 'https://bulletin.nuist.edu.cn'; @@ -22,14 +22,14 @@ const map = { }; module.exports = async (ctx) => { - const category = Object.hasOwn(map, ctx.params.category) ? ctx.params.category : '791'; + const category = Object.hasOwn(map, ctx.req.param('category')) ? ctx.req.param('category') : '791'; const link = `${baseUrl}/${category}/list.htm`; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.news_list').find('.news'); - ctx.state.data = { + ctx.set('data', { title: baseTitle + (category === '791' ? '' : ':' + map[category]), link, item: list @@ -57,5 +57,5 @@ module.exports = async (ctx) => { }; }) .get(), - }; + }); }; diff --git a/lib/v2/nuist/cas.js b/lib/v2/nuist/cas.js index 2aa26733a9..09e9062225 100644 --- a/lib/v2/nuist/cas.js +++ b/lib/v2/nuist/cas.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const baseTitle = 'NUIST AS（南信大大气科学学院）'; const baseUrl = 'https://cas.nuist.edu.cn'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { const link = `${baseUrl}/index/${category}.htm`; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('#ctl00_ctl00_body_NewsList') .find('tr.gridline') .toArray() @@ -37,7 +37,7 @@ module.exports = async (ctx) => { let response; try { response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const authorMatch = $('.zzxx') .text() @@ -62,10 +62,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: baseTitle + '：' + $('.dqlm').find('a').eq(1).text(), description: $('meta[name=description]').attr('content'), link, item: items, - }; + }); }; diff --git a/lib/v2/nuist/jwc.js b/lib/v2/nuist/jwc.js index 4d939c4649..f4f2e5ab1d 100644 --- a/lib/v2/nuist/jwc.js +++ b/lib/v2/nuist/jwc.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseTitle = '南京信息工程大学-教务处'; const baseUrl = 'https://jwc.nuist.edu.cn'; @@ -10,7 +10,7 @@ module.exports = async (ctx) => { const link = `${baseUrl}/${category === 'jxyw' || category === 'xyjx' ? 'index' : 'xxtz'}/${category}.htm`; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.main_list ul li') .toArray() .map((item) => { @@ -26,7 +26,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.description = $('#vsb_content').html(); @@ -35,9 +35,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: baseTitle + '：' + $('.dqwz').find('a').eq(1).text(), link, item: items, - }; + }); }; diff --git a/lib/v2/nuist/library/lib.js b/lib/v2/nuist/library/lib.js index c3a29bcbe7..c475757dfa 100644 --- a/lib/v2/nuist/library/lib.js +++ b/lib/v2/nuist/library/lib.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseTitle = '南京信息工程大学图书馆通知'; const baseUrl = 'https://lib.nuist.edu.cn'; @@ -8,7 +8,7 @@ module.exports = async (ctx) => { const link = baseUrl + '/index/tzgg.htm'; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.list2 li') .toArray() .map((item) => { @@ -25,7 +25,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.description = $('#vsb_content').html(); item.pubDate = parseDate($('.date').find('span').eq(0).text(), 'YYYY年MM月DD日'); @@ -35,9 +35,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: baseTitle, link, item: items, - }; + }); }; diff --git a/lib/v2/nuist/scs.js b/lib/v2/nuist/scs.js index afa6cdd80d..eef4078d9d 100644 --- a/lib/v2/nuist/scs.js +++ b/lib/v2/nuist/scs.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseTitle = 'NUIST CS（南信大计软院）'; const baseUrl = 'https://scs.nuist.edu.cn'; @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const link = `${baseUrl}/${category}/list.htm`; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.newsList ul') .eq(0) @@ -28,7 +28,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const authorMatch = $('.newsTitleAddDate') .text() @@ -40,10 +40,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: baseTitle + '：' + $('head title').text(), description: $('meta[name=description]').attr('content'), link, item: items, - }; + }); }; diff --git a/lib/v2/nuist/sese.js b/lib/v2/nuist/sese.js index fd31d29c11..4c6a7d3075 100644 --- a/lib/v2/nuist/sese.js +++ b/lib/v2/nuist/sese.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseTitle = 'NUIST ESE（南信大环科院）'; const baseUrl = 'https://sese.nuist.edu.cn'; @@ -10,7 +10,7 @@ module.exports = async (ctx) => { const link = `${baseUrl}/${category}.htm`; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('#ctl00_ctl00_mainbody_rightbody_listcontent_NewsList .gridline') .toArray() .map((item) => { @@ -27,7 +27,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.description = $('#vsb_content_6').html(); @@ -36,10 +36,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: baseTitle + '：' + $('.lmtitle').text(), description: $('meta[name=description]').attr('content'), link, item: items, - }; + }); }; diff --git a/lib/v2/nuist/xgc.js b/lib/v2/nuist/xgc.js index 090a2981e6..700c741f62 100644 --- a/lib/v2/nuist/xgc.js +++ b/lib/v2/nuist/xgc.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseTitle = '南信大学生工作处'; const baseUrl = 'https://xgc.nuist.edu.cn'; @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const link = baseUrl + '/419/list.htm'; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.wp_article_list .list_item') .toArray() .map((item) => { @@ -27,7 +27,7 @@ module.exports = async (ctx) => { let response; try { response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const articleInfo = $('.arti_metas'); @@ -41,9 +41,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: baseTitle, link, item: items.filter(Boolean), - }; + }); }; diff --git a/lib/v2/nuist/yjs.js b/lib/v2/nuist/yjs.js index 3fe190f154..75821dc7a7 100644 --- a/lib/v2/nuist/yjs.js +++ b/lib/v2/nuist/yjs.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const path = ctx.path === '/yjs/' ? 'index/tzgg' : ctx.path.replace(/^\/yjs\//, ''); @@ -14,7 +14,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.gridlinediv') .toArray() @@ -38,7 +38,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); const timeMatches = content('.bar') .text() @@ -52,9 +52,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/nwafu/all.js b/lib/v2/nwafu/all.js index e70f74c679..0882e0887f 100644 --- a/lib/v2/nwafu/all.js +++ b/lib/v2/nwafu/all.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { nwafuMap } = require('./utils'); module.exports = async (ctx) => { const { type = 'jiaowu' } = ctx.params; const response = await got.get(nwafuMap.get(type)[0]); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $(nwafuMap.get(type)[1]) .map((index, ele) => { const itemTitle = $(ele).find(nwafuMap.get(type)[2]).text(); @@ -27,17 +27,17 @@ module.exports = async (ctx) => { return item; } const detailResponse = await got.get(item.link); - const $ = cheerio.load(detailResponse.data); + const $ = load(detailResponse.data); item.description = $(nwafuMap.get(type)[3]).html(); return item; }) ) ); - ctx.state.data = { + ctx.set('data', { title: nwafuMap.get(type)[4], link: nwafuMap.get(type)[0], description: nwafuMap.get(type)[4], item: out, - }; + }); }; diff --git a/lib/v2/nyaa/main.js b/lib/v2/nyaa/main.js index 97496bc3bc..3e83ebdd6f 100644 --- a/lib/v2/nyaa/main.js +++ b/lib/v2/nyaa/main.js @@ -1,4 +1,4 @@ -const config = require('@/config').value; +import { config } from '@/config'; const Parser = require('rss-parser'); module.exports = async (ctx) => { @@ -36,10 +36,10 @@ module.exports = async (ctx) => { return item; }); - ctx.state.data = { + ctx.set('data', { title: feed.title, link: currentLink, description: feed.description, item: feed.items, - }; + }); }; diff --git a/lib/v2/nytimes/book.js b/lib/v2/nytimes/book.js index 11be6b84bf..8c547e5b39 100644 --- a/lib/v2/nytimes/book.js +++ b/lib/v2/nytimes/book.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const categoryList = { 'combined-print-and-e-book-nonfiction': '非虚构类 - 综合', @@ -16,7 +16,7 @@ const categoryList = { }; module.exports = async (ctx) => { - const category = ctx.params.category ?? 'combined-print-and-e-book-nonfiction'; + const category = ctx.req.param('category') ?? 'combined-print-and-e-book-nonfiction'; const url = `https://www.nytimes.com/books/best-sellers/${category}`; @@ -28,7 +28,7 @@ module.exports = async (ctx) => { url, }); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); dataTitle = $('h1').eq(0).text(); items = $('article[itemprop=itemListElement]') @@ -63,9 +63,9 @@ module.exports = async (ctx) => { .get(); } - ctx.state.data = { + ctx.set('data', { title: `The New York Times Best Sellers - ${dataTitle}`, link: url, item: items, - }; + }); }; diff --git a/lib/v2/nytimes/daily-briefing-chinese.js b/lib/v2/nytimes/daily-briefing-chinese.js index 1aad4fc234..64b888735b 100644 --- a/lib/v2/nytimes/daily-briefing-chinese.js +++ b/lib/v2/nytimes/daily-briefing-chinese.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -34,7 +34,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); // to remove ads content('.StoryBodyCompanionColumn').last().find('p').last().remove(); @@ -59,9 +59,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '新闻简报 - The New York Times', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/nytimes/index.js b/lib/v2/nytimes/index.js index 7f12af1bbc..2002d22968 100644 --- a/lib/v2/nytimes/index.js +++ b/lib/v2/nytimes/index.js @@ -1,7 +1,8 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const parser = require('@/utils/rss-parser'); const utils = require('./utils'); -const cheerio = require('cheerio'); +import { load } from 'cheerio'; +import puppeteer from '@/utils/puppeteer'; module.exports = async (ctx) => { let { lang = '' } = ctx.params; @@ -38,7 +39,7 @@ module.exports = async (ctx) => { // Do nothing } - const browser = await require('@/utils/puppeteer')(); + const browser = puppeteer(); const feed = await parser.parseURL(rssUrl); const items = await Promise.all( feed.items.splice(0, 10).map(async (item) => { @@ -74,7 +75,7 @@ module.exports = async (ctx) => { }); if (lang === 'en') { - const $ = cheerio.load(response); + const $ = load(response); if ($('.dual-btn').length > 0) { hasEnVersion = true; link = $('.dual-btn a').last().attr().href; @@ -113,10 +114,10 @@ module.exports = async (ctx) => { browser.close(); - ctx.state.data = { + ctx.set('data', { title, link: 'https://cn.nytimes.com', description: title, item: items, - }; + }); }; diff --git a/lib/v2/nytimes/utils.js b/lib/v2/nytimes/utils.js index ccaf42ed5e..df77369ce0 100644 --- a/lib/v2/nytimes/utils.js +++ b/lib/v2/nytimes/utils.js @@ -1,5 +1,5 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const ProcessImage = ($, e) => { const photo = $(e).find('figure').find('picture').find('img'); @@ -30,7 +30,7 @@ const PuppeterGetter = async (ctx, browser, link) => { }; const ProcessFeed = (data, hasEnVersion = false) => { - const $ = cheerio.load(data); + const $ = load(data); let content; const result = {}; diff --git a/lib/v2/oceanengine/arithmetic-index.js b/lib/v2/oceanengine/arithmetic-index.js index 4ca6d121df..9d22b86fb0 100644 --- a/lib/v2/oceanengine/arithmetic-index.js +++ b/lib/v2/oceanengine/arithmetic-index.js @@ -1,9 +1,10 @@ const dayjs = require('dayjs'); -const { art } = require('@/utils/render'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { art } from '@/utils/render'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const path = require('path'); -const config = require('@/config').value; +import { config } from '@/config'; +import puppeteer from '@/utils/puppeteer'; // Parameters const CACHE_MAX_AGE = config.cache.contentExpire; @@ -80,23 +81,23 @@ module.exports = async (ctx) => { const now = dayjs(); const start_date = now.subtract(DEFAULT_FETCH_DURATION_MONTH, 'month').format('YYYYMMDD'); const end_date = now.format('YYYYMMDD'); - const keyword = ctx.params.keyword; + const keyword = ctx.req.param('keyword'); if (!keyword) { throw new Error('Invalid keyword'); } - if (ctx.params.channel && !['douyin', 'toutiao'].includes(ctx.params.channel)) { + if (ctx.req.param('channel') && !['douyin', 'toutiao'].includes(ctx.req.param('channel'))) { throw new Error('Invalid channel。 Only support `douyin` or `toutiao`'); } - const channel = ctx.params.channel === 'toutiao' ? 'toutiao' : 'aweme'; // default channel is `douyin` - const channelName = ctx.params.channel === 'toutiao' ? '头条' : '抖音'; + const channel = ctx.req.param('channel') === 'toutiao' ? 'toutiao' : 'aweme'; // default channel is `douyin` + const channelName = ctx.req.param('channel') === 'toutiao' ? '头条' : '抖音'; const link = `https://trendinsight.oceanengine.com/arithmetic-index/analysis?keyword=${keyword}&appName=${channel}`; const item = await ctx.cache.tryGet( link, async () => { - const browser = await require('@/utils/puppeteer')(); + const browser = puppeteer(); const page = await browser.newPage(); await page.setRequestInterception(true); page.on('request', (request) => { @@ -135,11 +136,11 @@ module.exports = async (ctx) => { false ); - ctx.state.data = { + ctx.set('data', { title: `${keyword} - ${channelName}指数波峰`, link, description: `巨量算数 - ${channelName}算数指数 | 关键词: ${keyword}`, language: 'zh-cn', item, - }; + }); }; diff --git a/lib/v2/odaily/activity.js b/lib/v2/odaily/activity.js index 96b74e4f8e..18577d3347 100644 --- a/lib/v2/odaily/activity.js +++ b/lib/v2/odaily/activity.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const { rootUrl } = require('./utils'); module.exports = async (ctx) => { - const currentUrl = `${rootUrl}/service/scheme/group/8?page=1&per_page=${ctx.query.limit ?? 25}`; + const currentUrl = `${rootUrl}/service/scheme/group/8?page=1&per_page=${ctx.req.query('limit') ?? 25}`; const response = await got({ method: 'get', @@ -26,7 +26,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data.match(/"content":"(.*)"}},"secondaryList":/)[1]); + const content = load(detailResponse.data.match(/"content":"(.*)"}},"secondaryList":/)[1]); content('img').each(function () { content(this).attr('src', content(this).attr('src').replaceAll('\\"', '')); @@ -39,9 +39,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '活动 - Odaily星球日报', link: `${rootUrl}/activityPage`, item: items, - }; + }); }; diff --git a/lib/v2/odaily/newsflash.js b/lib/v2/odaily/newsflash.js index 302f909db5..9187a20a8e 100644 --- a/lib/v2/odaily/newsflash.js +++ b/lib/v2/odaily/newsflash.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const { rootUrl } = require('./utils'); module.exports = async (ctx) => { - const currentUrl = `${rootUrl}/api/pp/api/info-flow/newsflash_columns/newsflashes?b_id=&per_page=${ctx.query.limit ?? 100}`; + const currentUrl = `${rootUrl}/api/pp/api/info-flow/newsflash_columns/newsflashes?b_id=&per_page=${ctx.req.query('limit') ?? 100}`; const response = await got({ method: 'get', @@ -18,9 +18,9 @@ module.exports = async (ctx) => { description: `
${item.description}
`, })); - ctx.state.data = { + ctx.set('data', { title: '快讯 - Odaily星球日报', link: `${rootUrl}/newsflash`, item: items, - }; + }); }; diff --git a/lib/v2/odaily/post.js b/lib/v2/odaily/post.js index 6155181ec7..0d049fba24 100644 --- a/lib/v2/odaily/post.js +++ b/lib/v2/odaily/post.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const { rootUrl } = require('./utils'); const titles = { @@ -16,9 +16,9 @@ const titles = { }; module.exports = async (ctx) => { - const id = ctx.params.id ?? '280'; + const id = ctx.req.param('id') ?? '280'; - const currentUrl = `${rootUrl}/api/pp/api/app-front/feed-stream?feed_id=${id}&b_id=&per_page=${ctx.query.limit ?? 25}`; + const currentUrl = `${rootUrl}/api/pp/api/app-front/feed-stream?feed_id=${id}&b_id=&per_page=${ctx.req.query('limit') ?? 25}`; const response = await got(currentUrl); @@ -39,7 +39,7 @@ module.exports = async (ctx) => { const ssr = JSON.parse(`{${detailResponse.data.match(/window\.__INITIAL_STATE__ = {(.*)}/)[1]}}`); - const content = cheerio.load(ssr.post.detail.content, null, false); + const content = load(ssr.post.detail.content, null, false); content('img').each((_, img) => { img.attribs.src = img.attribs.src.split('?x-oss-process')[0]; img.attribs.src = img.attribs.src.split('!heading')[0]; @@ -55,9 +55,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${titles[id]} - Odaily星球日报`, link: rootUrl, item: items, - }; + }); }; diff --git a/lib/v2/odaily/search-news.js b/lib/v2/odaily/search-news.js index 65dcae6466..d52c90968c 100644 --- a/lib/v2/odaily/search-news.js +++ b/lib/v2/odaily/search-news.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const { rootUrl } = require('./utils'); module.exports = async (ctx) => { - const currentUrl = `${rootUrl}/api/pp/api/search/entity-search?per_page=${ctx.query.limit ?? 25}&keyword=${ctx.params.keyword}&entity_type=newsflash`; + const currentUrl = `${rootUrl}/api/pp/api/search/entity-search?per_page=${ctx.req.query('limit') ?? 25}&keyword=${ctx.req.param('keyword')}&entity_type=newsflash`; const response = await got({ method: 'get', @@ -18,9 +18,9 @@ module.exports = async (ctx) => { description: `${item.description}
`, })); - ctx.state.data = { + ctx.set('data', { title: '快讯 - Odaily星球日报', - link: `${rootUrl}/search/${ctx.params.keyword}`, + link: `${rootUrl}/search/${ctx.req.param('keyword')}`, item: items, - }; + }); }; diff --git a/lib/v2/odaily/user.js b/lib/v2/odaily/user.js index 89b3b76580..752e10dd7b 100644 --- a/lib/v2/odaily/user.js +++ b/lib/v2/odaily/user.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const { rootUrl } = require('./utils'); module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); - const currentUrl = `${rootUrl}/service/feed_stream/user/${id}?b_id=10&per_page=${ctx.query.limit ?? 25}`; + const currentUrl = `${rootUrl}/service/feed_stream/user/${id}?b_id=10&per_page=${ctx.req.query('limit') ?? 25}`; let author = ''; @@ -31,7 +31,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data.match(/"content":"(.*)","extraction_tags":/)[1]); + const content = load(detailResponse.data.match(/"content":"(.*)","extraction_tags":/)[1]); content('img').each(function () { content(this).attr('src', content(this).attr('src').replaceAll('\\"', '')); @@ -45,9 +45,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${author} - Odaily星球日报`, link: `${rootUrl}/user/${id}`, item: items, - }; + }); }; diff --git a/lib/v2/oeeee/app/channel.js b/lib/v2/oeeee/app/channel.js index 882791b5ea..deb6c06444 100644 --- a/lib/v2/oeeee/app/channel.js +++ b/lib/v2/oeeee/app/channel.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const { parseArticle } = require('../utils'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { - const id = ctx.params.id ?? 50; + const id = ctx.req.param('id') ?? 50; const currentUrl = `https://api-ndapp.oeeee.com/friends.php?m=Zone&a=SpaceDoclist&uid=${id}&type=doc`; const { data: response } = await got(currentUrl); @@ -28,9 +28,9 @@ module.exports = async (ctx) => { const items = await Promise.all(list.map((item) => parseArticle(item, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: `南方都市报客户端 - ${channel}`, link: `https://m.mp.oeeee.com/u/${id}.html`, item: items, - }; + }); }; diff --git a/lib/v2/oeeee/app/reporter.js b/lib/v2/oeeee/app/reporter.js index f1d486c24e..729f75f041 100644 --- a/lib/v2/oeeee/app/reporter.js +++ b/lib/v2/oeeee/app/reporter.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { parseArticle } = require('../utils'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { - const id = ctx.params.id ?? 0; + const id = ctx.req.param('id') ?? 0; const currentUrl = `https://m.mp.oeeee.com/show.php?m=Doc&a=getAuthorInfo&id=${id}`; const { data: response } = await got(currentUrl); @@ -22,9 +22,9 @@ module.exports = async (ctx) => { const items = await Promise.all(list.map((item) => parseArticle(item, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: `南方都市报奥一网 - ${author}`, link: `https://m.mp.oeeee.com/w/${id}.html`, item: items, - }; + }); }; diff --git a/lib/v2/oeeee/utils.js b/lib/v2/oeeee/utils.js index 67e93378cd..3e4c9fc215 100644 --- a/lib/v2/oeeee/utils.js +++ b/lib/v2/oeeee/utils.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const parseArticle = (item, tryGet) => tryGet(item.link, async () => { @@ -10,7 +10,7 @@ const parseArticle = (item, tryGet) => url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); // nfapp page: if (content('.post-cont') && content('.post-cont').html()) { diff --git a/lib/v2/oeeee/web.js b/lib/v2/oeeee/web.js index 3bc8ecd616..d527be11ba 100644 --- a/lib/v2/oeeee/web.js +++ b/lib/v2/oeeee/web.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const { parseArticle } = require('./utils'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { - const channel = ctx.params.channel ?? 0; + const channel = ctx.req.param('channel') ?? 0; const currentUrl = `https://www.oeeee.com/api/channel.php?m=Js4channelNews&a=newLatest&cid=${channel}`; const { data: response } = await got(currentUrl); @@ -28,9 +28,9 @@ module.exports = async (ctx) => { const items = await Promise.all(list.map((item) => parseArticle(item, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: `南方都市报奥一网`, link: `https://www.oeeee.com/api/channel.php?s=/index/index/channel/${channelEname}`, item: items, - }; + }); }; diff --git a/lib/v2/oilchem/index.js b/lib/v2/oilchem/index.js index 4de1945c1d..f8710111ad 100644 --- a/lib/v2/oilchem/index.js +++ b/lib/v2/oilchem/index.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const routes = require('./routes'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const type = ctx.params.type ?? ''; - const category = ctx.params.category ?? ''; - const subCategory = ctx.params.subCategory ?? ''; + const type = ctx.req.param('type') ?? ''; + const category = ctx.req.param('category') ?? ''; + const subCategory = ctx.req.param('subCategory') ?? ''; const route = category === '' ? '' : `/${category}${subCategory === '' ? '' : `/${subCategory}`}`; @@ -19,7 +19,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.list ul ul li a') .map((_, item) => { @@ -39,7 +39,7 @@ module.exports = async (ctx) => { method: 'get', url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('#content').html(); item.pubDate = timezone( @@ -58,9 +58,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${$('.hdbox h3').text()} - 隆众资讯`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/oncc/index.js b/lib/v2/oncc/index.js index 8214931ad1..9e00bb4aa5 100644 --- a/lib/v2/oncc/index.js +++ b/lib/v2/oncc/index.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const path = require('path'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const rootUrl = 'https://hk.on.cc'; @@ -35,12 +35,12 @@ const channelMap = { }; module.exports = async (ctx) => { - const language = ctx.params.language; - const channel = ctx.params.channel ?? 'news'; + const language = ctx.req.param('language'); + const channel = ctx.req.param('channel') ?? 'news'; const newsUrl = `${rootUrl}/hk/${channel}/index${languageMap[language]}.html`; const response = await got.get(newsUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('#focusNews > div.focusItem[type=article]') .map((_, item) => { const title = $(item).find('div.focusTitle > span').text(); @@ -59,7 +59,7 @@ module.exports = async (ctx) => { list.map(async (item) => { const desc = await ctx.cache.tryGet(item.link, async () => { const detailResponse = await got.get(item.link); - const $ = cheerio.load(detailResponse.data); + const $ = load(detailResponse.data); const imageUrl = rootUrl + $('img').eq(0).attr('src'); const content = $('div.breakingNewsContent').html(); const description = art(path.join(__dirname, 'templates/article.art'), { @@ -75,9 +75,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: `東網 - ${channelMap[channel][language]}`, link: newsUrl, item: items, - }; + }); }; diff --git a/lib/v2/oncc/money18.js b/lib/v2/oncc/money18.js index edf14b54ec..dc77e3706e 100644 --- a/lib/v2/oncc/money18.js +++ b/lib/v2/oncc/money18.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const dayjs = require('dayjs'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const sections = { @@ -20,8 +20,8 @@ const sections = { }; module.exports = async (ctx) => { - const id = ctx.params.id ?? 'exp'; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 30; + const id = ctx.req.param('id') ?? 'exp'; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 30; const rootUrl = 'https://money18.on.cc'; const currentUrl = `${rootUrl}/finnews/news_${id === 'industry' ? 'industry.html' : `breaking.html?section=${id}`}`; @@ -92,7 +92,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = art(path.join(__dirname, 'templates/money18.art'), { images: content('.photo img') @@ -107,9 +107,9 @@ module.exports = async (ctx) => { ); } - ctx.state.data = { + ctx.set('data', { title: `東網產經 - ${sections[id]}`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/onehu/common.js b/lib/v2/onehu/common.js index 705184a3d9..0f4e260ad8 100644 --- a/lib/v2/onehu/common.js +++ b/lib/v2/onehu/common.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const link = 'https://onehu.xyz'; const response = await got(link); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('#board article') .toArray() .map((item) => { @@ -20,9 +20,9 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link, item: list, - }; + }); }; diff --git a/lib/v2/onet/news.js b/lib/v2/onet/news.js index 225e146a73..bbe8c025ae 100644 --- a/lib/v2/onet/news.js +++ b/lib/v2/onet/news.js @@ -1,8 +1,8 @@ const parser = require('@/utils/rss-parser'); -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const { parseArticleContent, parseMainImage } = require('./utils'); @@ -18,7 +18,7 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(response); + const $ = load(response); const content = parseArticleContent($); const mainImage = parseMainImage($); @@ -45,12 +45,12 @@ module.exports = async (ctx) => { }; }) ); - ctx.state.data = { + ctx.set('data', { title: feed.title, link: feed.link, description: feed.title, item: items, language: 'pl', image: 'https://ocdn.eu/wiadomosciucs/static/logo2017/onet2017big_dark.png', - }; + }); }; diff --git a/lib/v2/onet/utils.js b/lib/v2/onet/utils.js index af8a9a8145..061df7b39d 100644 --- a/lib/v2/onet/utils.js +++ b/lib/v2/onet/utils.js @@ -1,4 +1,4 @@ -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); const parseMainImage = ($) => { diff --git a/lib/v2/oo-software/changelog.js b/lib/v2/oo-software/changelog.js index 3a0fb7998c..2da0e7e613 100644 --- a/lib/v2/oo-software/changelog.js +++ b/lib/v2/oo-software/changelog.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const id = ctx.params.id ?? 'shutup10'; + const id = ctx.req.param('id') ?? 'shutup10'; const rootUrl = 'https://www.oo-software.com'; const currentUrl = `${rootUrl}/en/${id}/changelog`; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const items = $('.content h4') .toArray() @@ -32,9 +32,9 @@ module.exports = async (ctx) => { items[0].enclosure_url = $('.banner-inlay').find('a').attr('href'); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/openai/blog.js b/lib/v2/openai/blog.js index 327005fabe..9d352abe2d 100644 --- a/lib/v2/openai/blog.js +++ b/lib/v2/openai/blog.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { toTitleCase } = require('@/utils/common-utils'); const { getApiUrl, parseArticle } = require('./common'); module.exports = async (ctx) => { - const tag = ctx.params.tag || ''; + const tag = ctx.req.param('tag') || ''; const rootUrl = 'https://openai.com'; const blogRootUrl = 'https://openai.com/blog'; @@ -36,9 +36,9 @@ module.exports = async (ctx) => { const title = `OpenAI Blog${tag ? ` - ${toTitleCase(tag)}` : ''}`; - ctx.state.data = { + ctx.set('data', { title, link: blogOriginUrl, item: items, - }; + }); }; diff --git a/lib/v2/openai/chatgpt.js b/lib/v2/openai/chatgpt.js index 717d249136..0a5daaef23 100644 --- a/lib/v2/openai/chatgpt.js +++ b/lib/v2/openai/chatgpt.js @@ -1,7 +1,7 @@ const dayjs = require('dayjs'); -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const config = require('@/config').value; +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { config } from '@/config'; dayjs.extend(require('dayjs/plugin/isSameOrBefore')); @@ -18,7 +18,7 @@ module.exports = async (ctx) => { url: articleUrl, }); - const $ = cheerio.load(pageResponse.data); + const $ = load(pageResponse.data); const page = JSON.parse($('script#__NEXT_DATA__').text()); // 页面貌似是用 Next 渲染的，有现成的 JSON 数据可以直接 parse，而避免用 cheerio 去解析主体内容的 HTML const feedTitle = page.props.pageProps.articleContent.title; @@ -89,10 +89,10 @@ module.exports = async (ctx) => { false ); - ctx.state.data = { + ctx.set('data', { title: cache.feedTitle, description: cache.feedDesc, link: articleUrl, item: cache.items, - }; + }); }; diff --git a/lib/v2/openai/common.js b/lib/v2/openai/common.js index 6bf6c9ea01..5e6eeb8faa 100644 --- a/lib/v2/openai/common.js +++ b/lib/v2/openai/common.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { art } from '@/utils/render'; const path = require('path'); const getApiUrl = async () => { @@ -27,7 +27,7 @@ const parseArticle = (ctx, rootUrl, attributes) => method: 'get', url: textUrl, }); - let content = cheerio.load(detailResponse.data); + let content = load(detailResponse.data); const authors = content('[aria-labelledby="metaAuthorsHeading"] > li > a > span > span') .toArray() diff --git a/lib/v2/openai/research.js b/lib/v2/openai/research.js index 3af8174a3e..b4ef832b48 100644 --- a/lib/v2/openai/research.js +++ b/lib/v2/openai/research.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { getApiUrl, parseArticle } = require('./common'); module.exports = async (ctx) => { @@ -24,9 +24,9 @@ module.exports = async (ctx) => { const title = 'OpenAI Research'; - ctx.state.data = { + ctx.set('data', { title, link: researchRootUrl, item: items, - }; + }); }; diff --git a/lib/v2/openwrt/releases.js b/lib/v2/openwrt/releases.js index 7cb8b5e52e..9cbee47883 100644 --- a/lib/v2/openwrt/releases.js +++ b/lib/v2/openwrt/releases.js @@ -1,15 +1,15 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; module.exports = async (ctx) => { - const brand = ctx.params.brand; - const model = ctx.params.model; + const brand = ctx.req.param('brand'); + const model = ctx.req.param('model'); const url = `https://openwrt.org/toh/${brand}/${model}`; const response = await got(url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const table = $('#installation').next(); - ctx.state.data = { + ctx.set('data', { title: $('h1').text() + ' - OpenWrt Releases', link: url, description: $('.dw-content div.level1').text(), @@ -21,5 +21,5 @@ module.exports = async (ctx) => { description: `Firmware OpenWrt Install: ${table.find('.firmware_openwrt_install_url').html()}Firmware OpenWrt Upgrade: ${$('.firmware_openwrt_upgrade_url').html()}'`, }, ], - }; + }); }; diff --git a/lib/v2/orcid/index.js b/lib/v2/orcid/index.js index c412b738a5..1655f78825 100644 --- a/lib/v2/orcid/index.js +++ b/lib/v2/orcid/index.js @@ -1,16 +1,16 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const rootUrl = 'https://orcid.org/'; const currentUrl = `${rootUrl}${id}/worksPage.json?offset=0&sort=date&sortAsc=false&pageSize=20`; const response = await got(currentUrl); const items = response.data.groups; - const works = new Array(); - const out = new Array(); + const works = []; + const out = []; for (const item of items) { for (let j = 0; j < item.works.length; j++) { @@ -44,9 +44,9 @@ module.exports = async (ctx) => { return info; }); - ctx.state.data = { + ctx.set('data', { title: 'ORCID Works List' + id, link: currentUrl, item: out, - }; + }); }; diff --git a/lib/v2/oreno3d/get-sec-page-data.js b/lib/v2/oreno3d/get-sec-page-data.js index 429f99aaf6..a8e2533ba2 100644 --- a/lib/v2/oreno3d/get-sec-page-data.js +++ b/lib/v2/oreno3d/get-sec-page-data.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const rootUrl = 'https://oreno3d.com'; @@ -17,7 +17,7 @@ async function sync_detail(link) { const iwara_link_selector = 'header > figure.video-figure > a'; // 下载 const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); // 创建列表 const tags = []; const authors = []; diff --git a/lib/v2/oreno3d/main.js b/lib/v2/oreno3d/main.js index 318dc7bf79..082caaac52 100644 --- a/lib/v2/oreno3d/main.js +++ b/lib/v2/oreno3d/main.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); -const cheerio = require('cheerio'); +import { load } from 'cheerio'; const get_sec_page_data = require('./get-sec-page-data'); const rootUrl = 'https://oreno3d.com'; @@ -16,20 +16,20 @@ const sortRename = { function get_user_url(rootUrl, ctx, sort) { let userUrl = ''; // 判断userurl获取位置 - if (ctx.params.keyword) { - const keyword = ctx.params.keyword; + if (ctx.req.param('keyword')) { + const keyword = ctx.req.param('keyword'); userUrl = `${rootUrl}/search?sort=${sort}&keyword=${keyword}`; - } else if (ctx.params.characterid) { - const characterid = ctx.params.characterid; + } else if (ctx.req.param('characterid')) { + const characterid = ctx.req.param('characterid'); userUrl = `${rootUrl}/characters/${characterid}?sort=${sort}`; - } else if (ctx.params.authorid) { - const authorid = ctx.params.authorid; + } else if (ctx.req.param('authorid')) { + const authorid = ctx.req.param('authorid'); userUrl = `${rootUrl}/authors/${authorid}?sort=${sort}`; - } else if (ctx.params.tagid) { - const tagid = ctx.params.tagid; + } else if (ctx.req.param('tagid')) { + const tagid = ctx.req.param('tagid'); userUrl = `${rootUrl}/tags/${tagid}?sort=${sort}`; - } else if (ctx.params.originid) { - const originid = ctx.params.originid; + } else if (ctx.req.param('originid')) { + const originid = ctx.req.param('originid'); userUrl = `${rootUrl}/origins/${originid}?sort=${sort}`; } return userUrl; @@ -38,14 +38,14 @@ module.exports = async (ctx) => { // 获取视频链接列表及标题 function getLinksTitle(response) { const selector = 'a.box'; - const $ = cheerio.load(response.data); + const $ = load(response.data); const title = $('div.g-main-list').find('h1.main-h').text(); const list = $(selector); return { title, list }; } // 数据爬取和分析 async function getData(response) { - const $ = cheerio.load(response.data); + const $ = load(response.data); // 第一页，获取搜索主标题 const title = getLinksTitle(response).title; const list = getLinksTitle(response).list; @@ -96,13 +96,13 @@ module.exports = async (ctx) => { return { items, title }; } // 参数定义 - const sort = ctx.params.sort; - let pagelimit = ctx.params.pagelimit ?? 1; + const sort = ctx.req.param('sort'); + let pagelimit = ctx.req.param('pagelimit') ?? 1; // 根链接 const userUrl = get_user_url(rootUrl, ctx, sort); // 确认最大页数并比较修改(同时也是获取第一页的内容) const response = await got(userUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const maxPageSelector = 'div.container > main > div.g-main-list > ul.pagination > li:last-child > a'; // 页码判断 if ($(maxPageSelector)) { @@ -149,9 +149,9 @@ module.exports = async (ctx) => { item: realItem, }; // 生成RSS源码 - ctx.state.data = { + ctx.set('data', { title: `${data.title} - ${sortRename[sort]}(Page 1-${pagelimit})`, link: userUrl, item: data.item, - }; + }); }; diff --git a/lib/v2/oschina/news.js b/lib/v2/oschina/news.js index 6682bb44cb..686884b1a4 100644 --- a/lib/v2/oschina/news.js +++ b/lib/v2/oschina/news.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { parseDate, parseRelativeDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); -const cheerio = require('cheerio'); +import timezone from '@/utils/timezone'; +import { load } from 'cheerio'; const configs = { all: { @@ -32,7 +32,7 @@ const configs = { }; module.exports = async (ctx) => { - const category = ctx.params.category ?? 'all'; + const category = ctx.req.param('category') ?? 'all'; const config = configs[category]; const res = await got(config.ajaxUrl, { @@ -41,7 +41,7 @@ module.exports = async (ctx) => { 'X-Requested-With': 'XMLHttpRequest', }, }); - const $ = cheerio.load(res.data); + const $ = load(res.data); const list = $('.items .news-item') .toArray() @@ -65,7 +65,7 @@ module.exports = async (ctx) => { Referer: config.link, }, }); - const content = cheerio.load(detail.data); + const content = load(detail.data); content('.ad-wrap').remove(); item.description = content('.article-detail').html(); @@ -77,7 +77,7 @@ module.exports = async (ctx) => { Referer: config.link, }, }); - const content = cheerio.load(detail.data); + const content = load(detail.data); item.description = content('.file_content').html(); } @@ -86,9 +86,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `开源中国-${config.name}`, link: config.link, item: resultItem, - }; + }); }; diff --git a/lib/v2/oschina/topic.js b/lib/v2/oschina/topic.js index f2e70e80f1..5a671e32a6 100644 --- a/lib/v2/oschina/topic.js +++ b/lib/v2/oschina/topic.js @@ -1,19 +1,19 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { parseDate, parseRelativeDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); -const cheerio = require('cheerio'); +import timezone from '@/utils/timezone'; +import { load } from 'cheerio'; -async function load(link) { +async function loadContent(link) { const res = await got(link); - const content = cheerio.load(res.data); + const content = load(res.data); return content; } module.exports = async (ctx) => { - const topic = ctx.params.topic; + const topic = ctx.req.param('topic'); const topicUrl = `https://www.oschina.net/question/topic/${topic}?show=time`; - const $ = await load(topicUrl); + const $ = await loadContent(topicUrl); const topicName = $('.topic-info > .topic-header > h3').text(); const list = $('#questionList .question-item') .toArray() @@ -33,7 +33,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { try { - const content = await load(item.link); + const content = await loadContent(item.link); content('.ad-wrap').remove(); item.description = content('#articleContent').html(); } catch { @@ -44,10 +44,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `开源中国-${topicName}`, description: $('.topic-introduction').text(), link: topicUrl, item: resultItem, - }; + }); }; diff --git a/lib/v2/oschina/user.js b/lib/v2/oschina/user.js index 65ffd0c3dc..8c3015ef93 100644 --- a/lib/v2/oschina/user.js +++ b/lib/v2/oschina/user.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { parseDate, parseRelativeDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const { id, uid } = ctx.params; const res = id ? await got(`https://my.oschina.net/${id}`) : await got(`https://my.oschina.net/u/${uid}`); - const $ = cheerio.load(res.data); + const $ = load(res.data); const author = $('.user-name .name').text(); const list = $('#newestBlogList .blog-item') @@ -31,7 +31,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(item.link, async () => { if (item.accessible) { const detail = await got(item.link); - const content = cheerio.load(detail.data); + const content = load(detail.data); item.description = content('.article-detail').html(); } @@ -41,10 +41,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: author + '的博客', description: $('.user-text .user-signature').text(), link: `https://my.oschina.net/${id ?? uid}`, item: resultItem, - }; + }); }; diff --git a/lib/v2/oshwhub/explore.js b/lib/v2/oshwhub/explore.js index f24cd63e68..03a00b36fa 100644 --- a/lib/v2/oshwhub/explore.js +++ b/lib/v2/oshwhub/explore.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const path = require('path'); -const { art } = require('@/utils/render'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import { art } from '@/utils/render'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const md = require('markdown-it')({ html: true, linkify: true, @@ -49,7 +49,7 @@ const requestImages = (url, tryGet) => module.exports = async (ctx) => { const baseUrl = 'https://oshwhub.com'; - const sortType = ctx.params.sortType ?? 'updatedTime'; + const sortType = ctx.req.param('sortType') ?? 'updatedTime'; const url = `${baseUrl}/explore?projectSort=${sortType}`; const response = await got({ @@ -58,7 +58,7 @@ module.exports = async (ctx) => { }); const html = response.data; - const $ = cheerio.load(html); + const $ = load(html); const title = $('title').text(); const projects = $('a[class="project-link"]'); @@ -72,7 +72,7 @@ module.exports = async (ctx) => { }); const html = response.data; - const $$ = cheerio.load(html); + const $$ = load(html); const projectDetail = $$('div[class="projects-left-top"]'); const title = $$(projectDetail).find('span[class="title"]').text(); @@ -112,10 +112,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title, link: url, description: title, item: items, - }; + }); }; diff --git a/lib/v2/osu/beatmaps/packs.js b/lib/v2/osu/beatmaps/packs.js index c0b9f9b4fa..03d9819ae2 100644 --- a/lib/v2/osu/beatmaps/packs.js +++ b/lib/v2/osu/beatmaps/packs.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const { type = 'standard' } = ctx.params; @@ -8,10 +8,10 @@ module.exports = async (ctx) => { const link = `https://osu.ppy.sh/beatmaps/packs?type=${type}`; const response = await got.get(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const itemList = $('.beatmap-pack'); - ctx.state.data = { + ctx.set('data', { title: `osu! Beatmap Pack - ${type}`, link, item: itemList.toArray().map((element) => { @@ -31,5 +31,5 @@ module.exports = async (ctx) => { author, }; }), - }; + }); }; diff --git a/lib/v2/otobanana/cast.js b/lib/v2/otobanana/cast.js index 3d92fb2718..50002da5cc 100644 --- a/lib/v2/otobanana/cast.js +++ b/lib/v2/otobanana/cast.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { apiBase, baseUrl, getUserInfo, renderCast } = require('./utils'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const casts = castData.results.map((item) => renderCast(item)); - ctx.state.data = { + ctx.set('data', { title: `${userInfo.name} (@${userInfo.username}) - 音声投稿 | OTOBANANA`, description: userInfo.bio.replaceAll('\n', ' '), link: `${baseUrl}/user/${id}`, @@ -20,10 +20,10 @@ module.exports = async (ctx) => { author: userInfo.name, itunes_author: userInfo.name, item: casts, - }; + }); - ctx.state.json = { + ctx.set('json', { userInfo, castData, - }; + }); }; diff --git a/lib/v2/otobanana/livestream.js b/lib/v2/otobanana/livestream.js index e5bea69d9b..d47eda9056 100644 --- a/lib/v2/otobanana/livestream.js +++ b/lib/v2/otobanana/livestream.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { apiBase, baseUrl, getUserInfo, renderLive } = require('./utils'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const casts = liveData.results.map((item) => renderLive(item)); - ctx.state.data = { + ctx.set('data', { title: `${userInfo.name} (@${userInfo.username}) - ライブ配信 | OTOBANANA`, description: userInfo.bio.replaceAll('\n', ' '), link: `${baseUrl}/user/${id}`, @@ -20,10 +20,10 @@ module.exports = async (ctx) => { author: userInfo.name, itunes_author: userInfo.name, item: casts, - }; + }); - ctx.state.json = { + ctx.set('json', { userInfo, liveData, - }; + }); }; diff --git a/lib/v2/otobanana/timeline.js b/lib/v2/otobanana/timeline.js index 588e43930e..8d1298e972 100644 --- a/lib/v2/otobanana/timeline.js +++ b/lib/v2/otobanana/timeline.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { apiBase, baseUrl, getUserInfo, renderPost } = require('./utils'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const posts = postData.results.map((item) => renderPost(item)); - ctx.state.data = { + ctx.set('data', { title: `${userInfo.name} (@${userInfo.username}) - タイムライン | OTOBANANA`, description: userInfo.bio.replaceAll('\n', ' '), link: `${baseUrl}/user/${id}`, @@ -20,10 +20,10 @@ module.exports = async (ctx) => { author: userInfo.name, itunes_author: userInfo.name, item: posts, - }; + }); - ctx.state.json = { + ctx.set('json', { userInfo, postData, - }; + }); }; diff --git a/lib/v2/otobanana/utils.js b/lib/v2/otobanana/utils.js index 124d89d1d0..9a263c2149 100644 --- a/lib/v2/otobanana/utils.js +++ b/lib/v2/otobanana/utils.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const domain = 'otobanana.com'; diff --git a/lib/v2/ouc/it-postgraduate.js b/lib/v2/ouc/it-postgraduate.js index f492dc0519..26839b1fd9 100644 --- a/lib/v2/ouc/it-postgraduate.js +++ b/lib/v2/ouc/it-postgraduate.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const link = 'https://it.ouc.edu.cn/_s381/16619/list.psp'; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.col_news_list .news_list li'); - ctx.state.data = { + ctx.set('data', { title: '中国海洋大学信息科学与工程学院', link, description: '中国海洋大学信息科学与工程学院研究生招生通知公告', @@ -23,5 +23,5 @@ module.exports = async (ctx) => { pubDate: parseDate(item.find('span').text(), 'YYYY-MM-DD'), }; }), - }; + }); }; diff --git a/lib/v2/ouc/it-tx.js b/lib/v2/ouc/it-tx.js index 6c61855fa1..d31d8707ab 100644 --- a/lib/v2/ouc/it-tx.js +++ b/lib/v2/ouc/it-tx.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const host = 'https://it.ouc.edu.cn'; - const id = ctx.params.id || 'xwdt'; + const id = ctx.req.param('id') || 'xwdt'; const link = `${host}/tx/${id}/list.htm`; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const typeTitle = $('span.Column_Anchor').text(); const title = $('li.col_title h2').text(); @@ -27,7 +27,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.author = '中国海洋大学信息科学与工程学院'; item.description = $('.wp_articlecontent').html(); return item; @@ -35,10 +35,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `信息科学与工程学院团学工作 - ${typeTitle}${title === typeTitle ? '' : title}`, description: '中国海洋大学信息科学与工程学院团学工作', link, item: out, - }; + }); }; diff --git a/lib/v2/ouc/it.js b/lib/v2/ouc/it.js index b018c5bbba..665f5dd227 100644 --- a/lib/v2/ouc/it.js +++ b/lib/v2/ouc/it.js @@ -1,15 +1,15 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const host = 'https://it.ouc.edu.cn'; const typelist = ['学院要闻', '学院公告', '学术活动']; const urlList = ['xyyw/list.htm', 'xygg/list.htm', 'xshd/list.htm']; - const type = Number.parseInt(ctx.params.type) || 0; + const type = Number.parseInt(ctx.req.param('type')) || 0; const link = new URL(urlList[type], host).href; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.col_news_list .news_list li') .toArray() @@ -27,7 +27,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.author = '中国海洋大学信息科学与工程学院'; item.description = $('.wp_articlecontent').html(); return item; @@ -35,9 +35,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `中国海洋大学信息科学与工程学院${typelist[type]}`, link, item: out, - }; + }); }; diff --git a/lib/v2/ouc/jwc.js b/lib/v2/ouc/jwc.js index b1099775de..61aa7f7c2d 100644 --- a/lib/v2/ouc/jwc.js +++ b/lib/v2/ouc/jwc.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const link = 'https://jwc.ouc.edu.cn/6517/list.htm'; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.wp_article_list li') .toArray() .map((e) => { @@ -22,7 +22,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got('https://jwc.ouc.edu.cn' + item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.author = '中国海洋大学教务处'; item.description = $('.wp_articlecontent').html(); return item; @@ -30,10 +30,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '中国海洋大学教务处', link, description: '中国海洋大学教务处最新通知', item: out, - }; + }); }; diff --git a/lib/v2/ouc/jwgl.js b/lib/v2/ouc/jwgl.js index 6f2a882624..b9648825e8 100644 --- a/lib/v2/ouc/jwgl.js +++ b/lib/v2/ouc/jwgl.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const link = 'http://jwgl.ouc.edu.cn/public/listSchoolNotices.action?currentPage=1&recordsPerPage=15&qtitle='; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('div.datalist table tbody tr') .toArray() .map((e) => { @@ -26,17 +26,17 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.description = $('div.notice').html(); return item; }) ) ); - ctx.state.data = { + ctx.set('data', { title: '中国海洋大学选课信息教务通知', link, description: '中国海洋大学选课信息教务通知', item: out, - }; + }); }; diff --git a/lib/v2/ouc/yjs.js b/lib/v2/ouc/yjs.js index a428468b17..30b73ae13a 100644 --- a/lib/v2/ouc/yjs.js +++ b/lib/v2/ouc/yjs.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const link = 'https://yz.ouc.edu.cn/5926/list.htm'; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.wp_article_list li'); - ctx.state.data = { + ctx.set('data', { title: '中国海洋大学研究生院', link, description: '中国海洋大学研究生院通知公告', @@ -23,5 +23,5 @@ module.exports = async (ctx) => { pubDate: parseDate(item.find('.Article_PublishDate').text()), }; }), - }; + }); }; diff --git a/lib/v2/oup/index.js b/lib/v2/oup/index.js index a8191159b0..01b150bed6 100644 --- a/lib/v2/oup/index.js +++ b/lib/v2/oup/index.js @@ -1,18 +1,18 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const path = require('path'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const rootUrl = 'https://academic.oup.com'; module.exports = async (ctx) => { - const name = ctx.params.name; + const name = ctx.req.param('name'); const url = `${rootUrl}/${name}/issue`; const response = await got(url); const cookies = response.headers['set-cookie'].map((item) => item.split(';')[0]).join(';'); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('div.al-article-items') .map((_, item) => ({ title: $(item).find('a.at-articleLink').text(), @@ -28,7 +28,7 @@ module.exports = async (ctx) => { Cookie: cookies, }, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.author = content('a.linked-name.js-linked-name-trigger').text(); item.description = art(path.join(__dirname, 'templates/article.art'), { @@ -45,9 +45,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `OUP - ${name}`, link: url, item: items, - }; + }); }; diff --git a/lib/v2/outagereport/index.js b/lib/v2/outagereport/index.js index d69c54368f..d43d216276 100644 --- a/lib/v2/outagereport/index.js +++ b/lib/v2/outagereport/index.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const baseUrl = 'https://outage.report/'; module.exports = async (ctx) => { - const serviceName = ctx.params.name; // Which service do you want to monitor? Have to be the same as what it appears in URL. - const watchCount = ctx.params.count || 10; // How many reports is received during last 20 minutes? 10 reports as default. + const serviceName = ctx.req.param('name'); // Which service do you want to monitor? Have to be the same as what it appears in URL. + const watchCount = ctx.req.param('count') || 10; // How many reports is received during last 20 minutes? 10 reports as default. const url = `${baseUrl}${serviceName}`; const response = await got({ method: 'get', @@ -41,11 +41,11 @@ module.exports = async (ctx) => { } // how this RSS feed looks like - ctx.state.data = { + ctx.set('data', { title: `Is ${serviceName} Down Right Now?`, link: url, description: rssDescribe, item: outageHistory, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/panewslab/author.js b/lib/v2/panewslab/author.js index e5608461a5..9018f241c3 100644 --- a/lib/v2/panewslab/author.js +++ b/lib/v2/panewslab/author.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const rootUrl = 'https://panewslab.com'; - const apiUrl = `${rootUrl}/webapi/subject/articles?Rn=${ctx.query.limit ?? 25}&LId=1&tw=0&uid=${id}`; + const apiUrl = `${rootUrl}/webapi/subject/articles?Rn=${ctx.req.query('limit') ?? 25}&LId=1&tw=0&uid=${id}`; const currentUrl = `${rootUrl}/zh/author/${id}.html`; const response = await got({ @@ -31,7 +31,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description += content('#txtinfo').html(); @@ -40,9 +40,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `PANews - ${items[0].author}`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/panewslab/index.js b/lib/v2/panewslab/index.js index 0e8d52aa58..fc34cce18b 100644 --- a/lib/v2/panewslab/index.js +++ b/lib/v2/panewslab/index.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const categories = { 精选: '', @@ -18,10 +18,10 @@ const categories = { }; module.exports = async (ctx) => { - const category = ctx.params.category ?? '精选'; + const category = ctx.req.param('category') ?? '精选'; const rootUrl = 'https://panewslab.com'; - const apiUrl = `${rootUrl}/webapi/depth/list?LId=1&Rn=${ctx.query.limit ?? 25}&TagId=${categories[category]}&tw=0`; + const apiUrl = `${rootUrl}/webapi/depth/list?LId=1&Rn=${ctx.req.query('limit') ?? 25}&TagId=${categories[category]}&tw=0`; const currentUrl = `${rootUrl}/zh/profundity/index.html`; const response = await got({ @@ -46,7 +46,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description += content('#txtinfo').html(); @@ -55,9 +55,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `PANews - ${category}`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/panewslab/news.js b/lib/v2/panewslab/news.js index 2d861c418c..255cb332e6 100644 --- a/lib/v2/panewslab/news.js +++ b/lib/v2/panewslab/news.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const rootUrl = 'https://panewslab.com'; - const apiUrl = `${rootUrl}/webapi/flashnews?LId=1&Rn=${ctx.query.limit ?? 50}&tw=0`; + const apiUrl = `${rootUrl}/webapi/flashnews?LId=1&Rn=${ctx.req.query('limit') ?? 50}&tw=0`; const currentUrl = `${rootUrl}/zh/news/index.html`; const response = await got({ @@ -20,9 +20,9 @@ module.exports = async (ctx) => { category: item.tags, })); - ctx.state.data = { + ctx.set('data', { title: 'PANews - 快讯', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/panewslab/topic.js b/lib/v2/panewslab/topic.js index a35c73ac73..6a4a619214 100644 --- a/lib/v2/panewslab/topic.js +++ b/lib/v2/panewslab/topic.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const rootUrl = 'https://panewslab.com'; - const apiUrl = `${rootUrl}/webapi/subject/articles?Rn=${ctx.query.limit ?? 25}&LId=1&sid=${id}&tw=0`; + const apiUrl = `${rootUrl}/webapi/subject/articles?Rn=${ctx.req.query('limit') ?? 25}&LId=1&sid=${id}&tw=0`; const currentUrl = `${rootUrl}/zh/topiclist/${id}.html`; const response = await got({ @@ -31,7 +31,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description += content('#txtinfo').html(); @@ -40,9 +40,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `PANews - ${id}`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/papers/index.js b/lib/v2/papers/index.js index 5675e2fc05..17e7c96bf1 100644 --- a/lib/v2/papers/index.js +++ b/lib/v2/papers/index.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { const { category = 'arxiv/cs.CL' } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 150; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 150; const rootUrl = 'https://papers.cool'; const currentUrl = new URL(category, rootUrl).href; @@ -16,7 +16,7 @@ module.exports = async (ctx) => { const { data: response } = await got(currentUrl); - const $ = cheerio.load(response); + const $ = load(response); const pubDate = parseDate( $('p.info') @@ -64,7 +64,7 @@ module.exports = async (ctx) => { const title = $('title').text(); const icon = new URL('favicon.ico', rootUrl).href; - ctx.state.data = { + ctx.set('data', { item: items, title: title.split(/-/)[0].trim(), link: currentUrl, @@ -72,5 +72,5 @@ module.exports = async (ctx) => { icon, logo: icon, subtitle: $('h1').first().text(), - }; + }); }; diff --git a/lib/v2/paradigm/writing.js b/lib/v2/paradigm/writing.js index 5c5e3ce0fe..6836b6ff7a 100644 --- a/lib/v2/paradigm/writing.js +++ b/lib/v2/paradigm/writing.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseUrl = 'https://www.paradigm.xyz'; @@ -8,7 +8,7 @@ module.exports = async (ctx) => { const url = `${baseUrl}/writing`; const response = await got(url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const nextData = JSON.parse($('#__NEXT_DATA__').text()); const buildId = nextData.buildId; @@ -25,7 +25,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.api); - const $ = cheerio.load(response.data.pageProps.content, null, false); + const $ = load(response.data.pageProps.content, null, false); // Remove the TOC $('.toc').remove(); @@ -36,9 +36,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'Paradigm - Writing', link: url, item: items, - }; + }); }; diff --git a/lib/v2/parliament/section77.js b/lib/v2/parliament/section77.js index 6ceeaf22dc..93de266998 100644 --- a/lib/v2/parliament/section77.js +++ b/lib/v2/parliament/section77.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; const { CookieJar } = require('tough-cookie'); module.exports = async (ctx) => { @@ -53,7 +53,7 @@ module.exports = async (ctx) => { url, cookieJar, }); - const $ = cheerio.load(response); + const $ = load(response); if ($.text() === 'ยังไม่มีข้อมูล') { return result; @@ -84,7 +84,7 @@ module.exports = async (ctx) => { url: item.link, cookieJar, }); - const $ = cheerio.load(response); + const $ = load(response); // Select the first element with the class name 'comment-body' item.title = $('.title h5').first().text(); diff --git a/lib/v2/patagonia/new-arrivals.js b/lib/v2/patagonia/new-arrivals.js index d6947ed571..bf548729c5 100644 --- a/lib/v2/patagonia/new-arrivals.js +++ b/lib/v2/patagonia/new-arrivals.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); -const cheerio = require('cheerio'); +import { load } from 'cheerio'; const host = 'https://www.patagonia.com'; const categoryMap = { mens: ['mens-new', 'mens-new-arrivals'], @@ -28,7 +28,7 @@ module.exports = async (ctx) => { }); const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('.product') .map(function () { const data = {}; @@ -47,7 +47,7 @@ module.exports = async (ctx) => { return data; }) .get(); - ctx.state.data = { + ctx.set('data', { title: `Patagonia - New Arrivals - ${category.toUpperCase()}`, link: `${host}/shop/${categoryMap[category][1]}`, description: `Patagonia - New Arrivals - ${category.toUpperCase()}`, @@ -57,5 +57,5 @@ module.exports = async (ctx) => { link: item.link, category: item.category, })), - }; + }); }; diff --git a/lib/v2/paulgraham/article.js b/lib/v2/paulgraham/article.js index c223a0109c..ace6713d99 100644 --- a/lib/v2/paulgraham/article.js +++ b/lib/v2/paulgraham/article.js @@ -1,16 +1,16 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 30; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 30; const rootUrl = 'http://paulgraham.com'; const currentUrl = new URL('articles.html', rootUrl).href; const { data: response } = await got(currentUrl); - const $ = cheerio.load(response); + const $ = load(response); let items = $('font a') .slice(0, limit) @@ -29,7 +29,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(item.link, async () => { const { data: detailResponse } = await got(item.link); - const content = cheerio.load(detailResponse); + const content = load(detailResponse); const description = content('font').first(); @@ -46,7 +46,7 @@ module.exports = async (ctx) => { const title = $('title').text(); const icon = $('link[rel="shortcut icon"]').prop('href'); - ctx.state.data = { + ctx.set('data', { item: items, title: `${author} - ${title}`, link: currentUrl, @@ -58,5 +58,5 @@ module.exports = async (ctx) => { subtitle: title, author, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/penguin-random-house/articles.js b/lib/v2/penguin-random-house/articles.js index 86e8afe132..d05cbc2888 100644 --- a/lib/v2/penguin-random-house/articles.js +++ b/lib/v2/penguin-random-house/articles.js @@ -1,11 +1,11 @@ const utils = require('./utils'); -const cheerio = require('cheerio'); -const got = require('@/utils/got'); +import { load } from 'cheerio'; +import got from '@/utils/got'; module.exports = async (ctx) => { const link = 'https://www.penguinrandomhouse.com/articles/'; const res = await got(link); - const $ = cheerio.load(res.data); + const $ = load(res.data); const itemArray = $('.archive-module-half-container,.archive-module-third-container') .map(function () { @@ -18,10 +18,10 @@ module.exports = async (ctx) => { const out = await utils.parseList(itemArray, ctx, utils.parseArticle); - ctx.state.data = { + ctx.set('data', { title: 'Penguin Random House Articles', link, description: 'In-depth interviews, author essays, fascinating essays. Go deeper into the books you love.', item: out, - }; + }); }; diff --git a/lib/v2/penguin-random-house/thereaddown.js b/lib/v2/penguin-random-house/thereaddown.js index b6ecd28b4c..c6ccc0a288 100644 --- a/lib/v2/penguin-random-house/thereaddown.js +++ b/lib/v2/penguin-random-house/thereaddown.js @@ -1,11 +1,11 @@ const utils = require('./utils'); -const cheerio = require('cheerio'); -const got = require('@/utils/got'); +import { load } from 'cheerio'; +import got from '@/utils/got'; module.exports = async (ctx) => { const link = 'https://www.penguinrandomhouse.com/the-read-down/'; const res = await got(link); - const $ = cheerio.load(res.data); + const $ = load(res.data); const itemArray = $('.archive-module-half-container,.archive-module-third-container') .map(function () { @@ -18,10 +18,10 @@ module.exports = async (ctx) => { const out = await utils.parseList(itemArray, ctx, utils.parseBooks); - ctx.state.data = { + ctx.set('data', { title: 'Penguin Random House Book Lists', link, description: 'Never wonder what to read next! Check out these lists to find your next favorite book.', item: out, - }; + }); }; diff --git a/lib/v2/penguin-random-house/utils.js b/lib/v2/penguin-random-house/utils.js index 2c6012542e..adf244fade 100644 --- a/lib/v2/penguin-random-house/utils.js +++ b/lib/v2/penguin-random-house/utils.js @@ -1,11 +1,11 @@ -const cheerio = require('cheerio'); -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import { load } from 'cheerio'; +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; const parseBookInList = (element) => { - const $ = cheerio.load(element); + const $ = load(element); const title = $('h2').first().text(); const author = $('h2.author').first().text(); const description = $('.desc').first().text(); @@ -48,7 +48,7 @@ const parsePubDate = (data) => { }; const parseBooks = (element) => { - const $ = cheerio.load(element); + const $ = load(element); const description = $('h2.read-down-text').first().html(); let mainBlock = ''; @@ -66,7 +66,7 @@ const parseBooks = (element) => { }; const parseArticle = (element) => { - const $ = cheerio.load(element); + const $ = load(element); const description = $('h2.hdr-smalltxt').first().html(); const imageSrc = $('div.img-block>img').first().attr('src'); const imageAlt = $('div.img-block>img').first().attr('alt'); @@ -79,7 +79,7 @@ const parseArticle = (element) => { }); $('div.main-content>p,div.main-content>ul').map((i, element) => { - const appending = cheerio.load(element); + const appending = load(element); mainBlock += appending.html(); return appending; }); diff --git a/lib/v2/people/index.js b/lib/v2/people/index.js index db0591f643..eb3078afdf 100644 --- a/lib/v2/people/index.js +++ b/lib/v2/people/index.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const iconv = require('iconv-lite'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const { isValidHost } = require('@/utils/valid-host'); module.exports = async (ctx) => { @@ -10,7 +10,7 @@ module.exports = async (ctx) => { let { category = site === 'www' ? '59476' : '' } = ctx.params; category = site === 'cpc' && category === '24h' ? '87228' : category; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 30; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 30; if (!isValidHost(site)) { throw new Error('Invalid site'); @@ -22,7 +22,7 @@ module.exports = async (ctx) => { responseType: 'buffer', }); - const $ = cheerio.load(iconv.decode(response, 'gbk')); + const $ = load(iconv.decode(response, 'gbk')); $('em').remove(); $('.bshare-more, .page_n, .page').remove(); @@ -55,7 +55,7 @@ module.exports = async (ctx) => { }); const data = iconv.decode(detailResponse, 'gbk'); - const content = cheerio.load(data); + const content = load(data); content('.paper_num, #rwb_tjyd').remove(); @@ -70,9 +70,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/people/liuyan.js b/lib/v2/people/liuyan.js index 724882a6d5..f1f4585d08 100644 --- a/lib/v2/people/liuyan.js +++ b/lib/v2/people/liuyan.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const fid = ctx.params.id; - const state = ctx.params.state ?? '1'; + const fid = ctx.req.param('id'); + const state = ctx.req.param('state') ?? '1'; const rootUrl = 'http://liuyan.people.com.cn'; const currentUrl = `${rootUrl}/threads/list?fid=${fid}#state=${state}`; @@ -36,7 +36,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('.content').html(); currentForum = currentForum ?? content('#currentForum').text(); @@ -46,9 +46,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${currentForum} - 领导留言板 - 人民网`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/people/xjpjh.js b/lib/v2/people/xjpjh.js index 874b7e0572..5364519f71 100644 --- a/lib/v2/people/xjpjh.js +++ b/lib/v2/people/xjpjh.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const url = require('url'); const host = 'http://jhsjk.people.cn'; module.exports = async (ctx) => { - let keyword = ctx.params.keyword || 'all'; - let year = ctx.params.year || 0; + let keyword = ctx.req.param('keyword') || 'all'; + let year = ctx.req.param('year') || 0; let title = '习近平系列重要讲话'; title = title + '-' + keyword; @@ -23,7 +23,7 @@ module.exports = async (ctx) => { const link = `http://jhsjk.people.cn/result?keywords=${keyword}&year=${year}`; const response = await got.get(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('ul.list_14.p1_2.clearfix li') .slice(0, 10) @@ -47,7 +47,7 @@ module.exports = async (ctx) => { } const response = await got.get(itemUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const description = $('div.d2txt_con.clearfix').html().trim(); const single = { @@ -60,9 +60,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title, link, item: out, - }; + }); }; diff --git a/lib/v2/peopo/topic.js b/lib/v2/peopo/topic.js index e0c84e484a..d3a19f0aea 100644 --- a/lib/v2/peopo/topic.js +++ b/lib/v2/peopo/topic.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const baseUrl = 'https://www.peopo.org'; module.exports = async (ctx) => { const { topicId = '159' } = ctx.params; const url = `${baseUrl}/topic/${topicId}`; const response = await got(url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.view-list-title') .toArray() .map((item) => { @@ -23,7 +23,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.author = $('#user-info h3').text(); item.category = $('#node-terms .inline li') @@ -37,10 +37,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link: url, language: 'zh-TW', item: items, - }; + }); }; diff --git a/lib/v2/phoronix/index.js b/lib/v2/phoronix/index.js index 45f93e644c..ffab2b236d 100644 --- a/lib/v2/phoronix/index.js +++ b/lib/v2/phoronix/index.js @@ -1,6 +1,6 @@ const parser = require('@/utils/rss-parser'); -const cheerio = require('cheerio'); -const got = require('@/utils/got'); +import { load } from 'cheerio'; +import got from '@/utils/got'; const dayjs = require('dayjs'); dayjs.extend(require('dayjs/plugin/utc')); dayjs.extend(require('dayjs/plugin/timezone')); @@ -41,7 +41,7 @@ const feedFetch = async () => { }; const webFetchCb = (response) => { - const $ = cheerio.load(response.body); + const $ = load(response.body); return { title: $('title').text(), link: response.url, @@ -129,7 +129,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(`${articleCacheKey}:${item.link}`, async () => { const response = await got(item.link); const html = response.body; - const $ = cheerio.load(html); + const $ = load(html); const content = $('.content'); // Author @@ -191,7 +191,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(link, async () => { const response = await got(link); const html = response.data; - const $$ = cheerio.load(html); + const $$ = load(html); const page = $$('.content'); return page.html(); }) diff --git a/lib/v2/pianyuan/app.js b/lib/v2/pianyuan/app.js index 9c68f4f2c9..2dde299a4d 100644 --- a/lib/v2/pianyuan/app.js +++ b/lib/v2/pianyuan/app.js @@ -1,8 +1,8 @@ -const cheerio = require('cheerio'); +import { load } from 'cheerio'; const utils = require('./utils'); module.exports = async (ctx) => { - const media = ctx.params.media ?? -1; + const media = ctx.req.param('media') ?? -1; const link_base = 'https://pianyuan.org/'; let description = '电影和剧集'; let link = link_base; @@ -18,17 +18,17 @@ module.exports = async (ctx) => { } const response = await utils.request(link, ctx.cache); - const $ = cheerio.load(response.data); + const $ = load(response.data); const detailLinks = $('#main-container > div > div.col-md-10 > table > tbody > tr') .get() .map((tr) => $(tr).find('td.dt.prel.nobr > a').attr('href')); detailLinks.shift(); const items = await utils.ProcessFeed(detailLinks, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: '片源网', description, link: link_base, item: items, - }; + }); }; diff --git a/lib/v2/pianyuan/search.js b/lib/v2/pianyuan/search.js index 4f72607f0e..c5b30dea35 100644 --- a/lib/v2/pianyuan/search.js +++ b/lib/v2/pianyuan/search.js @@ -1,4 +1,4 @@ -const cheerio = require('cheerio'); +import { load } from 'cheerio'; const utils = require('./utils'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const link = link_base + `search?q=${searchKey}`; const response = await utils.request(link, ctx.cache); - const $ = cheerio.load(response.data); + const $ = load(response.data); // 只获取第一页的搜索结果 const searchLinks = $('.nomt > a') .get() @@ -25,7 +25,7 @@ module.exports = async (ctx) => { const link = new URL(e, link_base).href; const single = await ctx.cache.tryGet(link, async () => { const res = await utils.request(link, ctx.cache); - const content = cheerio.load(res.data); + const content = load(res.data); content('.ico.ico_bt') .get() .map((a) => detailLinks.push($(a).attr('href'))); @@ -36,10 +36,10 @@ module.exports = async (ctx) => { const items = await utils.ProcessFeed(detailLinks, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: '片源网', description, link: link_base, item: items, - }; + }); }; diff --git a/lib/v2/pianyuan/utils.js b/lib/v2/pianyuan/utils.js index 994a998504..5aff5b27e3 100644 --- a/lib/v2/pianyuan/utils.js +++ b/lib/v2/pianyuan/utils.js @@ -1,6 +1,6 @@ -const cheerio = require('cheerio'); -const got = require('@/utils/got'); -const config = require('@/config').value; +import { load } from 'cheerio'; +import got from '@/utils/got'; +import { config } from '@/config'; const security_key = 'pianyuan-security_session_verify'; const PHPSESSID_key = 'pianyuan-PHPSESSID'; const loginauth_key = 'pianyuan-py_loginauth'; @@ -13,7 +13,7 @@ const ProcessFeed = async (list, cache) => { const link = new URL(e, link_base).href; const single = await cache.tryGet(link, async () => { const response = await request(link, cache); - const content = cheerio.load(response.data); + const content = load(response.data); const magnet = content('.btn-primary').attr('href'); const torrent_name = content('body > div.jumbotron.masthead > div > div > div.col-sm-10.col-md-10.col-lg-10.text-left > h1').text(); const name = content('body > div.jumbotron.masthead > div > div > div.col-sm-10.col-md-10.col-lg-10.text-left > h2 > a').text(); diff --git a/lib/v2/picnob/user.js b/lib/v2/picnob/user.js index f8c4dc29ed..169b10d8af 100644 --- a/lib/v2/picnob/user.js +++ b/lib/v2/picnob/user.js @@ -1,16 +1,17 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const { puppeteerGet } = require('./utils'); +import puppeteer from '@/utils/puppeteer'; module.exports = async (ctx) => { const baseUrl = 'https://www.picnob.com'; const { id } = ctx.params; const url = `${baseUrl}/profile/${id}/`; - const browser = await require('@/utils/puppeteer')(); + const browser = puppeteer(); // TODO: can't bypass cloudflare 403 error without puppeteer let html; let usePuppeteer = false; @@ -28,7 +29,7 @@ module.exports = async (ctx) => { usePuppeteer = true; } } - const $ = cheerio.load(html); + const $ = load(html); const profileName = $('h1.fullname').text(); const userId = $('input[name=userid]').attr('value'); @@ -61,7 +62,7 @@ module.exports = async (ctx) => { const { data } = await got(link); html = data; } - const $ = cheerio.load(html); + const $ = load(html); return [ ...new Set( $('.post_slide a') @@ -88,11 +89,11 @@ module.exports = async (ctx) => { ); await browser.close(); - ctx.state.data = { + ctx.set('data', { title: `${profileName} (@${id}) - Picnob`, description: $('.info .sum').text(), link: url, image: $('.ava .pic img').attr('src'), item: list, - }; + }); }; diff --git a/lib/v2/picuki/profile.js b/lib/v2/picuki/profile.js index a65d6c61cb..98ca28a932 100644 --- a/lib/v2/picuki/profile.js +++ b/lib/v2/picuki/profile.js @@ -1,12 +1,13 @@ -const cheerio = require('cheerio'); +import { load } from 'cheerio'; const chrono = require('chrono-node'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); -const config = require('@/config').value; +import { config } from '@/config'; const { puppeteerGet } = require('./utils'); +import puppeteer from '@/utils/puppeteer'; function deVideo(media) { - const $ = cheerio.load(media); + const $ = load(media); let media_deVideo = ''; $('img,video').each((_, medium) => { const tag = medium.name; @@ -20,11 +21,11 @@ function deVideo(media) { module.exports = async (ctx) => { // use Puppeteer due to the obstacle by cloudflare challenge - const browser = await require('@/utils/puppeteer')(); + const browser = puppeteer(); - const id = ctx.params.id; - const displayVideo = ctx.params.functionalFlag !== '0'; - const includeStories = ctx.params.functionalFlag === '10'; + const id = ctx.req.param('id'); + const displayVideo = ctx.req.param('functionalFlag') !== '0'; + const includeStories = ctx.req.param('functionalFlag') === '10'; const profileUrl = `https://www.picuki.com/profile/${id}`; @@ -37,7 +38,7 @@ module.exports = async (ctx) => { config.cache.routeExpire, false ); - const $ = cheerio.load(data); + const $ = load(data); const profileName = $('.profile-name-bottom').text(); const profileImg = $('.profile-avatar > img').attr('src'); @@ -99,7 +100,7 @@ module.exports = async (ctx) => { // re-cache it await ctx.cache.set(url, data); } - const $ = cheerio.load(data); + const $ = load(data); // Instagram 允许最多 10 条图片/视频任意混合于一条 post，picuki 在所有情况下都会将它（们）置于 .single-photo 内 let html = ''; $('.single-photo img').each((_, item) => { @@ -161,11 +162,11 @@ module.exports = async (ctx) => { await browser.close(); - ctx.state.data = { + ctx.set('data', { title: `${profileName} (@${id}) - Picuki`, link: profileUrl, image: profileImg, description: profileDescription, item: items, - }; + }); }; diff --git a/lib/v2/pikabu/community.js b/lib/v2/pikabu/community.js index 45c71feae5..cddda1317f 100644 --- a/lib/v2/pikabu/community.js +++ b/lib/v2/pikabu/community.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { baseUrl, fixImage, fixVideo } = require('./utils'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const { data: response } = await got(`${baseUrl}/ajax/${type}/${name}${sortString}`); const items = response.data.stories.map((story) => { - const $ = cheerio.load(story.html, null, false); + const $ = load(story.html, null, false); const data = JSON.parse($('script[type="application/ld+json"]').text()); const content = $('.story__main'); @@ -28,10 +28,10 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: response.data.title, link: `${baseUrl}/${type}/${name}`, language: 'ru-RU', item: items, - }; + }); }; diff --git a/lib/v2/pikabu/user.js b/lib/v2/pikabu/user.js index 25fbbd6fc2..3b7324d873 100644 --- a/lib/v2/pikabu/user.js +++ b/lib/v2/pikabu/user.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const iconv = require('iconv-lite'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; const { baseUrl, fixImage, fixVideo } = require('./utils'); module.exports = async (ctx) => { @@ -12,7 +12,7 @@ module.exports = async (ctx) => { }); const charset = response.headers['content-type'].match(/charset=([\w-]+)/)[1]; // windows-1251 - const $ = cheerio.load(iconv.decode(response.data, charset)); + const $ = load(iconv.decode(response.data, charset)); const items = $('.story__main') .not('.story__placeholder') @@ -35,12 +35,12 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('meta[property="og:title"]').attr('content'), description: $('.profile__user-about-content').text(), image: $('meta[property="og:image"]').attr('content'), language: 'ru-RU', link, item: items, - }; + }); }; diff --git a/lib/v2/pikabu/utils.js b/lib/v2/pikabu/utils.js index d5acaafe61..f9379ce9db 100644 --- a/lib/v2/pikabu/utils.js +++ b/lib/v2/pikabu/utils.js @@ -1,4 +1,4 @@ -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); const baseUrl = 'https://pikabu.ru'; diff --git a/lib/v2/pincong/hot.js b/lib/v2/pincong/hot.js index cfaa8caa84..64da97c306 100644 --- a/lib/v2/pincong/hot.js +++ b/lib/v2/pincong/hot.js @@ -1,5 +1,5 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { baseUrl, puppeteerGet } = require('./utils'); module.exports = async (ctx) => { @@ -10,10 +10,10 @@ module.exports = async (ctx) => { // use Puppeteer due to the obstacle by cloudflare challenge const html = await puppeteerGet(url, ctx.cache); - const $ = cheerio.load(html); + const $ = load(html); const list = $('div.aw-item'); - ctx.state.data = { + ctx.set('data', { title: '品葱 - 精选', link: `${baseUrl}/hot/${category === '0' ? '' : `category-${category}`}`, item: list @@ -24,5 +24,5 @@ module.exports = async (ctx) => { pubDate: parseDate($(item).find('div.mod-footer .aw-small-text').text()), })) .get(), - }; + }); }; diff --git a/lib/v2/pincong/index.js b/lib/v2/pincong/index.js index 90af5e800e..0f7b243f0b 100644 --- a/lib/v2/pincong/index.js +++ b/lib/v2/pincong/index.js @@ -1,5 +1,5 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { baseUrl, puppeteerGet } = require('./utils'); module.exports = async (ctx) => { @@ -11,16 +11,16 @@ module.exports = async (ctx) => { hot: 'sort_type-hot__day2', }; - url += (ctx.params.sort && sortMap[ctx.params.sort]) || 'recommend-1'; - url += ctx.params.category ? '__category-' + ctx.params.category : ''; + url += (ctx.req.param('sort') && sortMap[ctx.req.param('sort')]) || 'recommend-1'; + url += ctx.req.param('category') ? '__category-' + ctx.req.param('category') : ''; // use Puppeteer due to the obstacle by cloudflare challenge const html = await puppeteerGet(url, ctx.cache); - const $ = cheerio.load(html); + const $ = load(html); const list = $('div.aw-item'); - ctx.state.data = { + ctx.set('data', { title: '品葱 - 发现', link: url, item: list @@ -30,5 +30,5 @@ module.exports = async (ctx) => { pubDate: parseDate($(item).attr('data-created-at') * 1000), })) .get(), - }; + }); }; diff --git a/lib/v2/pincong/topic.js b/lib/v2/pincong/topic.js index 6f46087f00..f22150bacf 100644 --- a/lib/v2/pincong/topic.js +++ b/lib/v2/pincong/topic.js @@ -1,18 +1,18 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { baseUrl, puppeteerGet } = require('./utils'); module.exports = async (ctx) => { - const url = `${baseUrl}/topic/${ctx.params.topic}`; + const url = `${baseUrl}/topic/${ctx.req.param('topic')}`; // use Puppeteer due to the obstacle by cloudflare challenge const html = await puppeteerGet(url, ctx.cache); - const $ = cheerio.load(html); + const $ = load(html); const list = $('div.aw-item'); - ctx.state.data = { - title: `品葱 - ${ctx.params.topic}`, + ctx.set('data', { + title: `品葱 - ${ctx.req.param('topic')}`, link: url, item: list .map((_, item) => ({ @@ -21,5 +21,5 @@ module.exports = async (ctx) => { pubDate: parseDate($(item).attr('data-created-at') * 1000), })) .get(), - }; + }); }; diff --git a/lib/v2/pincong/utils.js b/lib/v2/pincong/utils.js index abcef2837c..b3aa916679 100644 --- a/lib/v2/pincong/utils.js +++ b/lib/v2/pincong/utils.js @@ -1,8 +1,10 @@ +import puppeteer from '@/utils/puppeteer'; + const baseUrl = 'https://pincong.rocks'; const puppeteerGet = (url, cache) => cache.tryGet(url, async () => { - const browser = await require('@/utils/puppeteer')(); + const browser = puppeteer(); const page = await browser.newPage(); await page.setRequestInterception(true); page.on('request', (request) => { diff --git a/lib/v2/pingwest/status.js b/lib/v2/pingwest/status.js index b535e26988..3efa06de3e 100644 --- a/lib/v2/pingwest/status.js +++ b/lib/v2/pingwest/status.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const baseUrl = 'https://www.pingwest.com'; @@ -13,12 +13,12 @@ module.exports = async (ctx) => { Referer: baseUrl, }, }); - const $ = cheerio.load(response.data.data.list); + const $ = load(response.data.data.list); const items = $('section.item') .toArray() .map((ele) => { const timestamp = ele.attribs['data-t']; - const $item = cheerio.load(ele); + const $item = load(ele); const rightNode = $item('.news-info'); const tag = rightNode.find('.item-tag-list').text(); const title = rightNode.find('.title').text(); @@ -38,10 +38,10 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: '品玩 - 实时要闻', description: '品玩 - 实时要闻', link: `${baseUrl}/status`, item: items, - }; + }); }; diff --git a/lib/v2/pingwest/tag.js b/lib/v2/pingwest/tag.js index 7b2958813d..84f0a3907c 100644 --- a/lib/v2/pingwest/tag.js +++ b/lib/v2/pingwest/tag.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const utils = require('./utils'); module.exports = async (ctx) => { @@ -14,7 +14,7 @@ module.exports = async (ctx) => { Referer: baseUrl, }, }); - const $ = cheerio.load(res.data); + const $ = load(res.data); const tagId = $('.tag-detail').attr('data-id'); const tagName = $('.tag-detail .info .title').text(); return { tagId, tagName }; @@ -31,13 +31,13 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(response.data.data.list); + const $ = load(response.data.data.list); const items = await utils.articleListParser($, needFullText, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: `品玩 - ${tagName}`, description: `品玩 - ${tagName}`, link: tagUrl, item: items, - }; + }); }; diff --git a/lib/v2/pingwest/user.js b/lib/v2/pingwest/user.js index 58f8c21ee1..7722ee74d4 100644 --- a/lib/v2/pingwest/user.js +++ b/lib/v2/pingwest/user.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const utils = require('./utils'); module.exports = async (ctx) => { @@ -12,7 +12,7 @@ module.exports = async (ctx) => { Referer: baseUrl, }, }); - const $ = cheerio.load(res.data); + const $ = load(res.data); const userInfoNode = $('#J_userId'); return { userName: userInfoNode.text(), @@ -32,7 +32,7 @@ module.exports = async (ctx) => { Referer: baseUrl, }, }); - const $ = cheerio.load(response.data.data.list); + const $ = load(response.data.data.list); let item = []; const needFullText = option === 'fulltext'; @@ -49,11 +49,11 @@ module.exports = async (ctx) => { article: '文章', state: '动态', }; - ctx.state.data = { + ctx.set('data', { title: `品玩 - ${userName} - ${typeToLabel[type]}`, description: userSign, image: userAvatar, link: aimUrl, item, - }; + }); }; diff --git a/lib/v2/pingwest/utils.js b/lib/v2/pingwest/utils.js index 6d63b0c5e8..d2b0f229b4 100644 --- a/lib/v2/pingwest/utils.js +++ b/lib/v2/pingwest/utils.js @@ -1,7 +1,7 @@ -const cheerio = require('cheerio'); -const got = require('@/utils/got'); +import { load } from 'cheerio'; +import got from '@/utils/got'; const { parseDate, parseRelativeDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import timezone from '@/utils/timezone'; const modifiedLink = (link) => (link.startsWith('http') ? link : `https:${link}`); @@ -10,7 +10,7 @@ const statusListParser = ($) => { .toArray() .map((ele) => { const timestamp = ele.attribs.pt; - const $item = cheerio.load(ele); + const $item = load(ele); const mainNode = $item('.news-detail'); const imgsStr = mainNode .find('img') @@ -37,7 +37,7 @@ const articleListParser = async ($, needFullText, cache) => { $('.item') .toArray() .map(async (ele) => { - const $item = cheerio.load(ele); + const $item = load(ele); let titleNode, authorNode; if ($item('.news-detail').children().length <= 2) { @@ -76,7 +76,7 @@ const articleListParser = async ($, needFullText, cache) => { const getFullArticle = (link, cache) => cache.tryGet(link, async () => { const { data } = await got(link); - const $ = cheerio.load(data); + const $ = load(data); $('img').each((_, ele) => { if (ele.attribs.src.includes('?x-')) { ele.attribs.src = ele.attribs.src.split('?x-')[0]; diff --git a/lib/v2/pixabay/search.js b/lib/v2/pixabay/search.js index 5c01c2d31b..31b516cf69 100644 --- a/lib/v2/pixabay/search.js +++ b/lib/v2/pixabay/search.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const config = require('@/config').value; -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { config } from '@/config'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -16,7 +16,7 @@ module.exports = async (ctx) => { key, q, order, - per_page: ctx.query.limit ?? 200, + per_page: ctx.req.query('limit') ?? 200, }, }); return data; @@ -39,12 +39,12 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: `Search ${q} - Pixabay`, description: 'Download & use free nature stock photos in high resolution ✓ New free images everyday ✓ HD to 4K ✓ Best nature pictures for all devices on Pixabay', link: `${baseUrl}/images/search/${q}/${order === 'latest' ? '?order=latest' : ''}`, image: `https://pixabay.com/apple-touch-icon.png`, language: 'en', item: items, - }; + }); }; diff --git a/lib/v2/pixiv/bookmarks.js b/lib/v2/pixiv/bookmarks.js index 3b9ebee956..98b28ebb67 100644 --- a/lib/v2/pixiv/bookmarks.js +++ b/lib/v2/pixiv/bookmarks.js @@ -1,16 +1,16 @@ const { getToken } = require('./token'); const getBookmarks = require('./api/get-bookmarks'); const getUserDetail = require('./api/get-user-detail'); -const config = require('@/config').value; +import { config } from '@/config'; const pixivUtils = require('./utils'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { if (!config.pixiv || !config.pixiv.refreshToken) { throw new Error('pixiv RSS is disabled due to the lack of relevant config'); } - const id = ctx.params.id; + const id = ctx.req.param('id'); const token = await getToken(ctx.cache.tryGet); if (!token) { @@ -22,7 +22,7 @@ module.exports = async (ctx) => { const illusts = bookmarksResponse.data.illusts; const username = userDetailResponse.data.user.name; - ctx.state.data = { + ctx.set('data', { title: `${username} 的收藏`, link: `https://www.pixiv.net/users/${id}/bookmarks/artworks`, description: `${username} 的 pixiv 最新收藏`, @@ -36,5 +36,5 @@ module.exports = async (ctx) => { link: `https://www.pixiv.net/artworks/${illust.id}`, }; }), - }; + }); }; diff --git a/lib/v2/pixiv/illustfollow.js b/lib/v2/pixiv/illustfollow.js index 608906024f..e9e5c60a63 100644 --- a/lib/v2/pixiv/illustfollow.js +++ b/lib/v2/pixiv/illustfollow.js @@ -1,8 +1,8 @@ const { getToken } = require('./token'); const getIllustFollows = require('./api/get-illust-follows'); -const config = require('@/config').value; +import { config } from '@/config'; const pixivUtils = require('./utils'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { if (!config.pixiv || !config.pixiv.refreshToken) { @@ -16,7 +16,7 @@ module.exports = async (ctx) => { const response = await getIllustFollows(token); const illusts = response.data.illusts; - ctx.state.data = { + ctx.set('data', { title: `Pixiv关注的新作品`, link: 'https://www.pixiv.net/bookmark_new_illust.php', description: `Pixiv关注的画师们的最新作品`, @@ -30,5 +30,5 @@ module.exports = async (ctx) => { link: `https://www.pixiv.net/artworks/${illust.id}`, }; }), - }; + }); }; diff --git a/lib/v2/pixiv/novels.js b/lib/v2/pixiv/novels.js index 884b02fdd4..7146279ac7 100644 --- a/lib/v2/pixiv/novels.js +++ b/lib/v2/pixiv/novels.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const baseUrl = 'https://www.pixiv.net'; module.exports = async (ctx) => { @@ -37,11 +37,11 @@ module.exports = async (ctx) => { category: item.tags, })); - ctx.state.data = { + ctx.set('data', { title: data.body.extraData.meta.title, description: data.body.extraData.meta.ogp.description, image: Object.values(data.body.works)[0].profileImageUrl, link: url, item: items, - }; + }); }; diff --git a/lib/v2/pixiv/pixiv-got.js b/lib/v2/pixiv/pixiv-got.js index 2195cc350e..98b2ec57eb 100644 --- a/lib/v2/pixiv/pixiv-got.js +++ b/lib/v2/pixiv/pixiv-got.js @@ -1,8 +1,8 @@ const tls = require('tls'); const ipRegex = require('ip-regex'); -const got = require('@/utils/got'); +import got from '@/utils/got'; const logger = require('@/utils/logger'); -const pixivConfig = require('@/config').value.pixiv; +import { config } from '@/config'; async function dohResolve(name, jsonDohEndpoint) { try { @@ -31,19 +31,19 @@ const pixivGot = got.extend({ hooks: { beforeRequest: [ async (options) => { - if (!pixivConfig.bypassCdn) { + if (!config.pixiv.bypassCdn) { return; } let hostname = null; - const isIP = ipRegex({ exact: true }).test(pixivConfig.bypassCdnHostname); + const isIP = ipRegex({ exact: true }).test(config.pixiv.bypassCdnHostname); if (isIP) { - hostname = pixivConfig.bypassCdnHostname; + hostname = config.pixiv.bypassCdnHostname; } else { - const addresses = await dohResolve(pixivConfig.bypassCdnHostname, pixivConfig.bypassCdnDoh); + const addresses = await dohResolve(config.pixiv.bypassCdnHostname, config.pixiv.bypassCdnDoh); if (addresses.length) { hostname = addresses[Math.floor(addresses.length * Math.random())]; } else { - logger.warn(`No IPv4 address resolved from ${pixivConfig.bypassCdnHostname}`); + logger.warn(`No IPv4 address resolved from ${config.pixiv.bypassCdnHostname}`); } } if (hostname) { diff --git a/lib/v2/pixiv/ranking.js b/lib/v2/pixiv/ranking.js index c56178d5f7..8322906b73 100644 --- a/lib/v2/pixiv/ranking.js +++ b/lib/v2/pixiv/ranking.js @@ -1,8 +1,8 @@ const { getToken } = require('./token'); const getRanking = require('./api/get-ranking'); -const config = require('@/config').value; +import { config } from '@/config'; const pixivUtils = require('./utils'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; const titles = { day: 'pixiv 日排行', @@ -60,22 +60,22 @@ module.exports = async (ctx) => { throw new Error('pixiv RSS is disabled due to the lack of relevant config'); } - const mode = alias[ctx.params.mode] ?? ctx.params.mode; - const date = ctx.params.date ? new Date(ctx.params.date) : new Date(); + const mode = alias[ctx.req.param('mode')] ?? ctx.req.param('mode'); + const date = ctx.req.param('date') ? new Date(ctx.req.param('date')) : new Date(); const token = await getToken(ctx.cache.tryGet); if (!token) { throw new Error('pixiv not login'); } - const response = await getRanking(mode, ctx.params.date && date, token); + const response = await getRanking(mode, ctx.req.param('date') && date, token); const illusts = response.data.illusts; const dateStr = `${date.getFullYear()}年${date.getMonth() + 1}月${date.getDate()}日 `; - ctx.state.data = { - title: (ctx.params.date ? dateStr : '') + titles[mode], + ctx.set('data', { + title: (ctx.req.param('date') ? dateStr : '') + titles[mode], link: links[mode], description: dateStr + titles[mode], item: illusts.map((illust, index) => { @@ -89,5 +89,5 @@ module.exports = async (ctx) => { category: illust.tags.map((tag) => tag.name), }; }), - }; + }); }; diff --git a/lib/v2/pixiv/search.js b/lib/v2/pixiv/search.js index 8c89dcc909..aa11c7e0ee 100644 --- a/lib/v2/pixiv/search.js +++ b/lib/v2/pixiv/search.js @@ -1,18 +1,18 @@ const { getToken } = require('./token'); const searchPopularIllust = require('./api/search-popular-illust'); const searchIllust = require('./api/search-illust'); -const config = require('@/config').value; +import { config } from '@/config'; const pixivUtils = require('./utils'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { if (!config.pixiv || !config.pixiv.refreshToken) { throw new Error('pixiv RSS is disabled due to the lack of relevant config'); } - const keyword = ctx.params.keyword; - const order = ctx.params.order || 'date'; - const mode = ctx.params.mode; + const keyword = ctx.req.param('keyword'); + const order = ctx.req.param('order') || 'date'; + const mode = ctx.req.param('mode'); const token = await getToken(ctx.cache.tryGet); if (!token) { @@ -28,7 +28,7 @@ module.exports = async (ctx) => { illusts = illusts.filter((item) => item.x_restrict === 1); } - ctx.state.data = { + ctx.set('data', { title: `${keyword} 的 pixiv ${order === 'popular' ? '热门' : ''}内容`, link: `https://www.pixiv.net/tags/${keyword}/artworks`, item: illusts.map((illust) => { @@ -42,5 +42,5 @@ module.exports = async (ctx) => { }; }), allowEmpty: true, - }; + }); }; diff --git a/lib/v2/pixiv/token.js b/lib/v2/pixiv/token.js index 87dcec0261..85caa503f0 100644 --- a/lib/v2/pixiv/token.js +++ b/lib/v2/pixiv/token.js @@ -1,4 +1,4 @@ -const config = require('@/config').value; +import { config } from '@/config'; const logger = require('@/utils/logger'); const got = require('./pixiv-got'); const { maskHeader } = require('./constants'); diff --git a/lib/v2/pixiv/user.js b/lib/v2/pixiv/user.js index 46c2d6eb5c..1e2fbfa3ec 100644 --- a/lib/v2/pixiv/user.js +++ b/lib/v2/pixiv/user.js @@ -1,15 +1,15 @@ const { getToken } = require('./token'); const getIllusts = require('./api/get-illusts'); -const config = require('@/config').value; +import { config } from '@/config'; const pixivUtils = require('./utils'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { if (!config.pixiv || !config.pixiv.refreshToken) { throw new Error('pixiv RSS is disabled due to the lack of relevant config'); } - const id = ctx.params.id; + const id = ctx.req.param('id'); const token = await getToken(ctx.cache.tryGet); if (!token) { throw new Error('pixiv not login'); @@ -20,7 +20,7 @@ module.exports = async (ctx) => { const illusts = response.data.illusts; const username = illusts[0].user.name; - ctx.state.data = { + ctx.set('data', { title: `${username} 的 pixiv 动态`, link: `https://www.pixiv.net/users/${id}`, description: `${username} 的 pixiv 最新动态`, @@ -35,5 +35,5 @@ module.exports = async (ctx) => { category: illust.tags.map((t) => t.name), }; }), - }; + }); }; diff --git a/lib/v2/pixiv/utils.js b/lib/v2/pixiv/utils.js index 3b6292772f..44fc349f1a 100644 --- a/lib/v2/pixiv/utils.js +++ b/lib/v2/pixiv/utils.js @@ -1,4 +1,4 @@ -const config = require('@/config').value; +import { config } from '@/config'; module.exports = { getImgs(illust) { diff --git a/lib/v2/piyao/jrpy.js b/lib/v2/piyao/jrpy.js index 58b9dc500f..ecf604b47f 100644 --- a/lib/v2/piyao/jrpy.js +++ b/lib/v2/piyao/jrpy.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const rootUrl = 'https://www.piyao.org.cn'; @@ -8,7 +8,7 @@ module.exports = async (ctx) => { const currentUrl = `${rootUrl}/jrpy/index.htm`; const response = await got(currentUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('ul#list li') .map((_, item) => ({ title: $(item).find('a').text(), @@ -20,7 +20,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const detailResponse = await got(item.link); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.title = content('div.con_tit > h2').text(); item.description = content('div.con_txt').html(); @@ -31,9 +31,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '今日辟谣', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/pkmer/recent.js b/lib/v2/pkmer/recent.js index 8989f68864..d90e4c08db 100644 --- a/lib/v2/pkmer/recent.js +++ b/lib/v2/pkmer/recent.js @@ -1,21 +1,21 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const baseUrl = 'https://pkmer.cn'; module.exports = async (ctx) => { const { data: response } = await got(`${baseUrl}/page/1/`); - const $ = cheerio.load(response); + const $ = load(response); const items = process($); - ctx.state.data = { + ctx.set('data', { title: 'PKMer', icon: 'https://cdn.pkmer.cn/covers/logo.png!nomark', logo: 'https://cdn.pkmer.cn/covers/logo.png!nomark', link: baseUrl, allowEmpty: true, item: items, - }; + }); }; function process($) { diff --git a/lib/v2/pku/bbs/hot.js b/lib/v2/pku/bbs/hot.js index 9fd00a085d..0c999815ad 100644 --- a/lib/v2/pku/bbs/hot.js +++ b/lib/v2/pku/bbs/hot.js @@ -1,8 +1,8 @@ -const config = require('@/config').value; -const cheerio = require('cheerio'); -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { config } from '@/config'; +import { load } from 'cheerio'; +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { const cookie = config.pkubbs.cookie; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { headers.cookie = cookie; } const r = await got('https://bbs.pku.edu.cn/v2/hot-topic.php', { headers }); - const $ = cheerio.load(r.body); + const $ = load(r.body); const listItems = $('#list-content .list-item') .map(function () { return { @@ -28,7 +28,7 @@ module.exports = async (ctx) => { // try catch 处理部分无 Cookie 时无法访问的帖子 try { const r = await got(url, { headers }); - const $ = cheerio.load(r.body); + const $ = load(r.body); const date = $('.post-card:first-child .sl-triangle-container .down-list span').text() || $('.post-card:first-child .sl-triangle-container .title span').text(); return { title, @@ -47,10 +47,10 @@ module.exports = async (ctx) => { }) ) ); - ctx.state.data = { + ctx.set('data', { title: '北大未名BBS 全站十大', link: 'https://bbs.pku.edu.cn/v2/hot-topic.php', description: '北大未名BBS 全站热门话题前十名', item, - }; + }); }; diff --git a/lib/v2/pku/cls/announcement.js b/lib/v2/pku/cls/announcement.js index 3476b9d9bb..18f6a3ab46 100644 --- a/lib/v2/pku/cls/announcement.js +++ b/lib/v2/pku/cls/announcement.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const homeUrl = 'https://bio.pku.edu.cn/homes/Index/news/21/21.html'; @@ -9,7 +9,7 @@ const baseUrl = 'https://bio.pku.edu.cn'; module.exports = async (ctx) => { const response = await got(homeUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('div.normal_list>ul a') .toArray() @@ -26,7 +26,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const { data: response } = await got(item.link); - const $ = cheerio.load(response); + const $ = load(response); item.description = $('div.page div.common_width div.col-md-9').first().html(); return item; @@ -34,9 +34,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '北京大学生命科学学院通知公告', link: homeUrl, item: items, - }; + }); }; diff --git a/lib/v2/pku/cls/lecture.js b/lib/v2/pku/cls/lecture.js index a227226241..59d81501c0 100644 --- a/lib/v2/pku/cls/lecture.js +++ b/lib/v2/pku/cls/lecture.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const homeUrl = 'http://bio.pku.edu.cn/homes/Index/news_jz/7/7.html'; const baseUrl = 'http://bio.pku.edu.cn'; @@ -8,8 +8,8 @@ const baseUrl = 'http://bio.pku.edu.cn'; module.exports = async (ctx) => { const response = await got(homeUrl); - const $ = cheerio.load(response.data); - ctx.state.data = { + const $ = load(response.data); + ctx.set('data', { title: `北京大学生命科学学院近期讲座`, link: homeUrl, description: `北京大学生命科学学院近期讲座`, @@ -21,5 +21,5 @@ module.exports = async (ctx) => { link: baseUrl + $('a.clearfix').attr('href'), })) .get(), - }; + }); }; diff --git a/lib/v2/pku/eecs.js b/lib/v2/pku/eecs.js index 74082468f7..e4c8915e88 100644 --- a/lib/v2/pku/eecs.js +++ b/lib/v2/pku/eecs.js @@ -1,20 +1,20 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { eecsMap } = require('./utils'); module.exports = async (ctx) => { const host = 'https://eecs.pku.edu.cn'; - let type = ctx.params && Number.parseInt(ctx.params.type); + let type = ctx.params && Number.parseInt(ctx.req.param('type')); if (type === undefined) { type = 0; } const response = await got(host + '/xygk1/ggtz/' + eecsMap.get(type)); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.hvr-shutter-out-vertical') .toArray() .map((item) => { @@ -30,7 +30,7 @@ module.exports = async (ctx) => { items.map((item) => ctx.cache.tryGet(item.link, async () => { const detail = await got(item.link); - const content = cheerio.load(detail.data); + const content = load(detail.data); content('input').remove(); content('h1').remove(); @@ -55,10 +55,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: host + '/xygk1/ggtz/' + eecsMap.get(type), description: '北大信科 公告通知', item: items, - }; + }); }; diff --git a/lib/v2/pku/hr.js b/lib/v2/pku/hr.js index a2be6f5f4a..5e55728a00 100644 --- a/lib/v2/pku/hr.js +++ b/lib/v2/pku/hr.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const category = ctx.params.category?.replace(/-/g, '/') ?? 'zxgg'; + const category = ctx.req.param('category')?.replace(/-/g, '/') ?? 'zxgg'; const rootUrl = 'https://hr.pku.edu.cn/'; const currentUrl = `${rootUrl}/${category}/index.htm`; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.item-list li a') .map((_, item) => { @@ -34,7 +34,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); content('.title').remove(); @@ -46,9 +46,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${$('h2').text()} - ${$('title').text()}`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/pku/nsd.js b/lib/v2/pku/nsd.js index 30dfac8292..53e9aaa44e 100644 --- a/lib/v2/pku/nsd.js +++ b/lib/v2/pku/nsd.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { finishArticleItem } = require('@/utils/wechat-mp'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; const baseUrl = 'https://nsd.pku.edu.cn/sylm/gd/'; @@ -22,7 +22,7 @@ const pageType = (href) => { module.exports = async (ctx) => { const response = await got({ url: baseUrl, https: { rejectUnauthorized: false } }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('div.maincontent > ul > li') .map((_index, item) => { const href = $(item).find('a').attr('href'); @@ -44,14 +44,14 @@ module.exports = async (ctx) => { case 'pku-news': return ctx.cache.tryGet(item.link, async () => { const detailResponse = await got({ url: item.link, https: { rejectUnauthorized: false } }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('div.pageArticle > div.col.lf').html(); return item; }); case 'in-site': return ctx.cache.tryGet(item.link, async () => { const detailResponse = await got({ url: item.link, https: { rejectUnauthorized: false } }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('div.article').html(); return item; }); @@ -61,9 +61,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '观点 - 北京大学国家发展研究院', link: baseUrl, item: items, - }; + }); }; diff --git a/lib/v2/pku/pkuyjs.js b/lib/v2/pku/pkuyjs.js index 2454463142..0da532df2e 100644 --- a/lib/v2/pku/pkuyjs.js +++ b/lib/v2/pku/pkuyjs.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const link = 'https://admission.pku.edu.cn/zsxx/sszs/index.htm'; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.zsxx_cont_list li'); - ctx.state.data = { + ctx.set('data', { title: `${$('.twostage_title_C').text()} - ${$('title').text()}`, link, description: '北京大学研究生院通知公告', @@ -25,5 +25,5 @@ module.exports = async (ctx) => { }; }) .get(), - }; + }); }; diff --git a/lib/v2/pku/rccp/mzyt.js b/lib/v2/pku/rccp/mzyt.js index 9d815a32ca..894a582c31 100644 --- a/lib/v2/pku/rccp/mzyt.js +++ b/lib/v2/pku/rccp/mzyt.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseUrl = 'https://www.rccp.pku.edu.cn/mzyt/'; module.exports = async (ctx) => { const response = await got(baseUrl); - const $ = cheerio.load(response.data); - ctx.state.data = { + const $ = load(response.data); + ctx.set('data', { title: '每周一推 - 北京大学中国政治学研究中心', link: baseUrl, description: $('meta[name="description"]').attr('content'), @@ -19,5 +19,5 @@ module.exports = async (ctx) => { link: baseUrl + $(item).find('a').attr('href'), })) .get(), - }; + }); }; diff --git a/lib/v2/pku/scc/recruit.js b/lib/v2/pku/scc/recruit.js index 5a8b5533e8..bbe7305d53 100644 --- a/lib/v2/pku/scc/recruit.js +++ b/lib/v2/pku/scc/recruit.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const arr = { xwrd: 'home!newsHome.action?category=12', @@ -13,11 +13,11 @@ const arr = { const baseUrl = 'https://scc.pku.edu.cn/'; module.exports = async (ctx) => { - const type = ctx.params.type ?? 'zpxx'; + const type = ctx.req.param('type') ?? 'zpxx'; const rootUrl = baseUrl + arr[type]; const list_response = await got(rootUrl); - const $ = cheerio.load(list_response.data); + const $ = load(list_response.data); const feed_title = $('h2.category').text(); @@ -36,14 +36,14 @@ module.exports = async (ctx) => { const sorted = list.sort((a, b) => b.pubDate.getTime() - a.pubDate.getTime()).slice(0, 10); - ctx.state.data = { + ctx.set('data', { title: `北京大学学生就业指导服务中心 - ${feed_title}`, link: rootUrl, item: await Promise.all( sorted.map((item) => ctx.cache.tryGet(item.link, async () => { const detail_page = await got(item.link); - const detail = cheerio.load(detail_page.data); + const detail = load(detail_page.data); const script = detail('script', 'div#content-div').html(); if (script !== null) { const content_route = script.match(/\$\("#content-div"\).load\("(\S+)"\)/)[1]; @@ -54,5 +54,5 @@ module.exports = async (ctx) => { }) ) ), - }; + }); }; diff --git a/lib/v2/pku/ss/admission.js b/lib/v2/pku/ss/admission.js index b7cd0572ce..77ef87cc84 100644 --- a/lib/v2/pku/ss/admission.js +++ b/lib/v2/pku/ss/admission.js @@ -6,10 +6,10 @@ module.exports = async (ctx) => { const items = await getSingleRecord(host); const out = await Promise.all(items.map((item) => getArticle(item, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: '北大软微-招生通知', description: '北京大学软件与微电子学院 - 招生通知', link: host, item: out, - }; + }); }; diff --git a/lib/v2/pku/ss/common.js b/lib/v2/pku/ss/common.js index d518c79654..a9354eb4d1 100644 --- a/lib/v2/pku/ss/common.js +++ b/lib/v2/pku/ss/common.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseUrl = 'https://www.ss.pku.edu.cn'; const getSingleRecord = async (url) => { const res = await got(url); - const $ = cheerio.load(res.data); + const $ = load(res.data); const list = $('#info-list-ul').find('li'); return list.toArray().map((item) => { @@ -24,7 +24,7 @@ const getSingleRecord = async (url) => { const getArticle = (item, tryGet) => tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.description = $('.article-content').html(); return item; diff --git a/lib/v2/pku/ss/notice.js b/lib/v2/pku/ss/notice.js index 71dfeb058f..261ee28def 100644 --- a/lib/v2/pku/ss/notice.js +++ b/lib/v2/pku/ss/notice.js @@ -6,10 +6,10 @@ module.exports = async (ctx) => { const items = await getSingleRecord(host); const out = await Promise.all(items.map((item) => getArticle(item, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: '北大软微-通知公告', description: '北京大学软件与微电子学院 - 通知公告', link: host, item: out, - }; + }); }; diff --git a/lib/v2/pku/ss/pg-admin.js b/lib/v2/pku/ss/pg-admin.js index 2c7fdd801f..f4d32f16ca 100644 --- a/lib/v2/pku/ss/pg-admin.js +++ b/lib/v2/pku/ss/pg-admin.js @@ -6,10 +6,10 @@ module.exports = async (ctx) => { const items = await getSingleRecord(host); const out = await Promise.all(items.map((item) => getArticle(item, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: '北大软微-硕士统考招生', description: '北京大学软件与微电子学院 - 硕士统考招生通知', link: host, item: out, - }; + }); }; diff --git a/lib/v2/playno1/av.js b/lib/v2/playno1/av.js index b8331c9953..7d5ac4b8d0 100644 --- a/lib/v2/playno1/av.js +++ b/lib/v2/playno1/av.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { cookieJar, processArticle } = require('./utils'); const baseUrl = 'http://www.playno1.com'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { const response = await got(url, { cookieJar, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.fire_float') .toArray() @@ -32,10 +32,10 @@ module.exports = async (ctx) => { items = await processArticle(items, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link: url, item: items, language: 'zh-TW', - }; + }); }; diff --git a/lib/v2/playno1/st.js b/lib/v2/playno1/st.js index 3e9df5126f..97ccedc00b 100644 --- a/lib/v2/playno1/st.js +++ b/lib/v2/playno1/st.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { cookieJar, processArticle } = require('./utils'); const baseUrl = 'http://stno1.playno1.com'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { const response = await got(url, { cookieJar, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.fallsBox') .toArray() @@ -27,10 +27,10 @@ module.exports = async (ctx) => { items = await processArticle(items, ctx.cache); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link: url, item: items, language: 'zh-TW', - }; + }); }; diff --git a/lib/v2/playno1/utils.js b/lib/v2/playno1/utils.js index 18c0de2b97..5839d80f7e 100644 --- a/lib/v2/playno1/utils.js +++ b/lib/v2/playno1/utils.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { CookieJar, Cookie } = require('tough-cookie'); const cookieJar = new CookieJar(); const cookie = Cookie.fromJSON({ @@ -19,7 +19,7 @@ const processArticle = (items, cache) => const detailResponse = await got(item.link, { cookieJar, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('#article_content').html(); return item; }) diff --git a/lib/v2/playpcesor/rss.js b/lib/v2/playpcesor/rss.js index 6e37e0e422..d6a7e1de20 100644 --- a/lib/v2/playpcesor/rss.js +++ b/lib/v2/playpcesor/rss.js @@ -1,11 +1,11 @@ -const { parseDate } = require('@/utils/parse-date'); -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import { parseDate } from '@/utils/parse-date'; +import got from '@/utils/got'; +import { load } from 'cheerio'; module.exports = async (ctx) => { const url = 'https://www.playpcesor.com/'; const response = await got({ method: 'get', url }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $("article[class='post-outer-container']") .map((i, e) => { @@ -24,9 +24,9 @@ module.exports = async (ctx) => { }) .get(); - ctx.state.data = { + ctx.set('data', { title: '电脑玩物', link: url, item: list, - }; + }); }; diff --git a/lib/v2/plurk/anonymous.js b/lib/v2/plurk/anonymous.js index bebf728d3a..7fdbc45dca 100644 --- a/lib/v2/plurk/anonymous.js +++ b/lib/v2/plurk/anonymous.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { baseUrl, getPlurk } = require('./utils'); module.exports = async (ctx) => { const { data: apiResponse } = await got(`${baseUrl}/Stats/getAnonymousPlurks`, { searchParams: { offset: 0, - limit: ctx.query.limit ? Number(ctx.query.limit) : 200, + limit: ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 200, }, }); @@ -14,10 +14,10 @@ module.exports = async (ctx) => { const items = await Promise.all(Object.values(apiResponse).map((item) => getPlurk(`plurk:${item.plurk_id}`, item, 'ಠ_ಠ', ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: 'Anonymous - Plurk', image: 'https://s.plurk.com/2c1574c02566f3b06e91.png', link: `${baseUrl}/anonymous`, item: items, - }; + }); }; diff --git a/lib/v2/plurk/hotlinks.js b/lib/v2/plurk/hotlinks.js index 1ae48cc339..292a1f31bd 100644 --- a/lib/v2/plurk/hotlinks.js +++ b/lib/v2/plurk/hotlinks.js @@ -1,20 +1,20 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { baseUrl, getPlurk } = require('./utils'); module.exports = async (ctx) => { const { data: apiResponse } = await got(`${baseUrl}/hotlinks/getLinks`, { searchParams: { offset: 0, - count: ctx.query.limit ? Number(ctx.query.limit) : 30, + count: ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 30, }, }); const items = await Promise.all(apiResponse.map((item) => getPlurk(item.link_url.startsWith('https://www.plurk.com/p/') ? item.link_url : `plurk:${item.link_url}`, item, null, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: `Hot Links - Plurk`, image: 'https://s.plurk.com/2c1574c02566f3b06e91.png', link: `${baseUrl}/hotlinks`, item: items, - }; + }); }; diff --git a/lib/v2/plurk/news.js b/lib/v2/plurk/news.js index f7a1636342..0242011261 100644 --- a/lib/v2/plurk/news.js +++ b/lib/v2/plurk/news.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { baseUrl, fetchFriends, getPlurk } = require('./utils'); module.exports = async (ctx) => { @@ -14,10 +14,10 @@ module.exports = async (ctx) => { const items = await Promise.all(apiResponse.map((item) => getPlurk(`plurk:${item.plurk_id}`, item, names[item.user_id].display_name, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: 'Plurk News - Plurk', image: 'https://s.plurk.com/2c1574c02566f3b06e91.png', link: `${baseUrl}/news`, item: items, - }; + }); }; diff --git a/lib/v2/plurk/search.js b/lib/v2/plurk/search.js index 5173d04f10..3749596a30 100644 --- a/lib/v2/plurk/search.js +++ b/lib/v2/plurk/search.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const dayjs = require('dayjs'); const { baseUrl, getPlurk } = require('./utils'); @@ -17,11 +17,11 @@ module.exports = async (ctx) => { const items = await Promise.all(plurks.map((item) => getPlurk(`plurk:${item.plurk_id}`, item, users[item.user_id].display_name, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: `Search "${keyword}" - Plurk`, description: 'Search messages on Plurk', image: 'https://s.plurk.com/e8266f512246cdbc2721.jpg', link: `${baseUrl}/search?q=${encodeURIComponent(keyword)}`, item: items, - }; + }); }; diff --git a/lib/v2/plurk/top.js b/lib/v2/plurk/top.js index 4b1639c1a9..0732ac2704 100644 --- a/lib/v2/plurk/top.js +++ b/lib/v2/plurk/top.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { baseUrl, getPlurk } = require('./utils'); const categoryList = new Set(['topReplurks', 'topFavorites', 'topResponded']); @@ -13,17 +13,17 @@ module.exports = async (ctx) => { searchParams: { period: 'day', lang, - limit: ctx.query.limit ? Number(ctx.query.limit) : 90, + limit: ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 90, }, }); const items = await Promise.all(apiResponse.stats.map((item) => item[1]).map((item) => getPlurk(`plurk:${item.plurk_id}`, item, item.owner.display_name, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: 'Top Plurk - Plurk', image: 'https://s.plurk.com/2c1574c02566f3b06e91.png', link: `${baseUrl}/top#${category}`, item: items, language: lang, - }; + }); }; diff --git a/lib/v2/plurk/topic.js b/lib/v2/plurk/topic.js index 67c4d0b44e..3d7326777b 100644 --- a/lib/v2/plurk/topic.js +++ b/lib/v2/plurk/topic.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { baseUrl, fetchFriends, getPlurk } = require('./utils'); module.exports = async (ctx) => { @@ -9,11 +9,11 @@ module.exports = async (ctx) => { searchParams: { topic, offset: 0, - limit: ctx.query.limit ? Number(ctx.query.limit) : 30, + limit: ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 30, }, }); - const $ = cheerio.load(pageResponse); + const $ = load(pageResponse); delete apiResponse.pids; delete apiResponse.count; @@ -23,11 +23,11 @@ module.exports = async (ctx) => { const items = await Promise.all(Object.values(apiResponse).map((item) => getPlurk(`plurk:${item.plurk_id}`, item, names[item.user_id].display_name, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), description: $('meta[property=og:description]').attr('content'), image: $('meta[property=og:image]').attr('content') || $('meta[name=msapplication-TileImage]').attr('content'), link: `${baseUrl}/topic/${topic}`, item: items, - }; + }); }; diff --git a/lib/v2/plurk/user.js b/lib/v2/plurk/user.js index 35136fbc77..7d2ca876fa 100644 --- a/lib/v2/plurk/user.js +++ b/lib/v2/plurk/user.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { baseUrl, fetchFriends, getPlurk } = require('./utils'); module.exports = async (ctx) => { const { user } = ctx.params; const { data: pageResponse } = await got(`${baseUrl}/${user}`); - const $ = cheerio.load(pageResponse); + const $ = load(pageResponse); const publicPlurks = JSON.parse( $('body script[type]') @@ -21,11 +21,11 @@ module.exports = async (ctx) => { const items = await Promise.all(publicPlurks.map((item) => getPlurk(`plurk:${item.plurk_id}`, item, names[item.user_id].display_name, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), description: $('meta[property=og:description]').attr('content'), image: $('meta[property=og:image]').attr('content') || $('meta[name=msapplication-TileImage]').attr('content'), link: `${baseUrl}/${user}`, item: items, - }; + }); }; diff --git a/lib/v2/plurk/utils.js b/lib/v2/plurk/utils.js index d436bd2b1f..3fb2ef39f1 100644 --- a/lib/v2/plurk/utils.js +++ b/lib/v2/plurk/utils.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const baseUrl = 'https://www.plurk.com'; @@ -29,7 +29,7 @@ const fetchFriends = async (userIds) => { */ const getPlurk = (plurkGuid, item, author, tryGet) => tryGet(plurkGuid, () => { - const $ = cheerio.load(item.content || item.rendered, null, false); + const $ = load(item.content || item.rendered, null, false); $('img').each((_, e) => { e = $(e); e.removeAttr('height').removeAttr('width'); diff --git a/lib/v2/pnas/index.js b/lib/v2/pnas/index.js index 366e2753c6..3d01ce6395 100644 --- a/lib/v2/pnas/index.js +++ b/lib/v2/pnas/index.js @@ -1,11 +1,12 @@ -const cheerio = require('cheerio'); -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import { load } from 'cheerio'; +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const { setCookies } = require('@/utils/puppeteer-utils'); const { CookieJar } = require('tough-cookie'); const logger = require('@/utils/logger'); +import puppeteer from '@/utils/puppeteer'; module.exports = async (ctx) => { const baseUrl = 'https://www.pnas.org'; @@ -22,7 +23,7 @@ module.exports = async (ctx) => { await ctx.cache.set('pnas:cookieJar', cookieJar.toJSON()); } - const $ = cheerio.load(res); + const $ = load(res); const list = $('.card--row-reversed .card-content') .toArray() .map((item) => { @@ -35,7 +36,7 @@ module.exports = async (ctx) => { }; }); - const browser = await require('@/utils/puppeteer')(); + const browser = puppeteer(); const out = await Promise.all( list.map((item) => @@ -56,7 +57,7 @@ module.exports = async (ctx) => { const res = await page.evaluate(() => document.documentElement.innerHTML); await page.close(); - const $ = cheerio.load(res); + const $ = load(res); const PNASdataLayer = JSON.parse( $('script') .text() @@ -90,12 +91,12 @@ module.exports = async (ctx) => { browser.close(); - ctx.state.data = { + ctx.set('data', { title: `${$('.banner-widget__content h1').text()} - PNAS`, description: $('.banner-widget__content p').text(), image: 'https://www.pnas.org/favicon.ico', language: 'en-US', link, item: out, - }; + }); }; diff --git a/lib/v2/pornhub/category-url.js b/lib/v2/pornhub/category-url.js index 8640648fd3..7e97325b8d 100644 --- a/lib/v2/pornhub/category-url.js +++ b/lib/v2/pornhub/category-url.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { isValidHost } = require('@/utils/valid-host'); const { headers, parseItems } = require('./utils'); @@ -11,15 +11,15 @@ module.exports = async (ctx) => { } const { data: response } = await got(link, { headers }); - const $ = cheerio.load(response); + const $ = load(response); const items = $('#videoCategory .videoBox') .toArray() .map((e) => parseItems($(e))); - ctx.state.data = { + ctx.set('data', { title: $('title').first().text(), link, language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/pornhub/category.js b/lib/v2/pornhub/category.js index bdad4f120d..0358fcc7c7 100644 --- a/lib/v2/pornhub/category.js +++ b/lib/v2/pornhub/category.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const { defaultDomain, renderDescription } = require('./utils'); -const config = require('@/config').value; +import { config } from '@/config'; module.exports = async (ctx) => { - const category = ctx.params.caty; + const category = ctx.req.param('caty'); const categories = await ctx.cache.tryGet('pornhub:categories', async () => { const { data } = await got(`${defaultDomain}/webmasters/categories`); @@ -36,9 +36,9 @@ module.exports = async (ctx) => { category: [...new Set([...item.tags.map((t) => t.tag_name), ...item.categories.map((c) => c.category)])], })); - ctx.state.data = { + ctx.set('data', { title: `Pornhub - ${categoryName}`, link: `${defaultDomain}/video?c=${categoryId}`, item: list, - }; + }); }; diff --git a/lib/v2/pornhub/model.js b/lib/v2/pornhub/model.js index 349e4f84ce..36751eb66f 100644 --- a/lib/v2/pornhub/model.js +++ b/lib/v2/pornhub/model.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { isValidHost } = require('@/utils/valid-host'); const { headers, parseItems } = require('./utils'); @@ -11,12 +11,12 @@ module.exports = async (ctx) => { } const { data: response } = await got(link, { headers }); - const $ = cheerio.load(response); + const $ = load(response); const items = $('#mostRecentVideosSection .videoBox') .toArray() .map((e) => parseItems($(e))); - ctx.state.data = { + ctx.set('data', { title: $('title').first().text(), description: $('section.aboutMeSection').text().trim(), link, @@ -25,5 +25,5 @@ module.exports = async (ctx) => { icon: $('#getAvatar').attr('src'), language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/pornhub/pornstar.js b/lib/v2/pornhub/pornstar.js index 98fc1bf84b..9fb3170d5c 100644 --- a/lib/v2/pornhub/pornstar.js +++ b/lib/v2/pornhub/pornstar.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { isValidHost } = require('@/utils/valid-host'); const { headers, parseItems } = require('./utils'); @@ -11,12 +11,12 @@ module.exports = async (ctx) => { } const { data: response } = await got(link, { headers }); - const $ = cheerio.load(response); + const $ = load(response); const items = $('#mostRecentVideosSection .videoBox') .toArray() .map((e) => parseItems($(e))); - ctx.state.data = { + ctx.set('data', { title: $('title').first().text(), description: $('section.aboutMeSection').text().trim(), link, @@ -25,5 +25,5 @@ module.exports = async (ctx) => { icon: $('#getAvatar').attr('src'), language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/pornhub/search.js b/lib/v2/pornhub/search.js index 6aaa5d7d4b..5d586e90e7 100644 --- a/lib/v2/pornhub/search.js +++ b/lib/v2/pornhub/search.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const { defaultDomain, renderDescription } = require('./utils'); module.exports = async (ctx) => { @@ -15,9 +15,9 @@ module.exports = async (ctx) => { category: [...new Set([...item.tags.map((t) => t.tag_name), ...item.categories.map((c) => c.category)])], })); - ctx.state.data = { + ctx.set('data', { title: `Pornhub - ${keyword}`, link: currentUrl, item: list, - }; + }); }; diff --git a/lib/v2/pornhub/users.js b/lib/v2/pornhub/users.js index aff830af15..2aa2d11e2f 100644 --- a/lib/v2/pornhub/users.js +++ b/lib/v2/pornhub/users.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { isValidHost } = require('@/utils/valid-host'); const { headers, parseItems } = require('./utils'); @@ -11,12 +11,12 @@ module.exports = async (ctx) => { } const { data: response } = await got(link, { headers }); - const $ = cheerio.load(response); + const $ = load(response); const items = $('.videoUList .videoBox') .toArray() .map((e) => parseItems($(e))); - ctx.state.data = { + ctx.set('data', { title: $('title').first().text(), description: $('.aboutMeText').text().trim(), link, @@ -26,5 +26,5 @@ module.exports = async (ctx) => { language: $('html').attr('lang'), allowEmpty: true, item: items, - }; + }); }; diff --git a/lib/v2/pornhub/utils.js b/lib/v2/pornhub/utils.js index 1996ccad0e..a7944aefd4 100644 --- a/lib/v2/pornhub/utils.js +++ b/lib/v2/pornhub/utils.js @@ -1,6 +1,6 @@ -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); -const { parseRelativeDate } = require('@/utils/parse-date'); +import { parseRelativeDate } from '@/utils/parse-date'; const dayjs = require('dayjs'); const defaultDomain = 'https://www.pornhub.com'; diff --git a/lib/v2/postman/release-notes.js b/lib/v2/postman/release-notes.js index 8061f82faa..2f07446256 100644 --- a/lib/v2/postman/release-notes.js +++ b/lib/v2/postman/release-notes.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const md = require('markdown-it')({ html: true, }); @@ -19,9 +19,9 @@ module.exports = async (ctx) => { description: md.render(item.content), })); - ctx.state.data = { + ctx.set('data', { title: 'Release Notes | Postman', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/producthunt/today.js b/lib/v2/producthunt/today.js index ca1e845052..8ae1527e63 100644 --- a/lib/v2/producthunt/today.js +++ b/lib/v2/producthunt/today.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { const response = await got('https://www.producthunt.com/'); - const data = JSON.parse(cheerio.load(response.data)('#__NEXT_DATA__').html()); + const data = JSON.parse(load(response.data)('#__NEXT_DATA__').html()); const list = Object.values(data.props.apolloState) .filter((o) => o.__typename === 'Post') @@ -19,7 +19,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(item.slug, async () => { const detailresponse = await got(`https://www.producthunt.com/posts/${item.slug}`); - const data = JSON.parse(cheerio.load(detailresponse.data)('#__NEXT_DATA__').html()); + const data = JSON.parse(load(detailresponse.data)('#__NEXT_DATA__').html()); const descData = data.props.apolloState[`Post${item.id}`]; return { @@ -36,9 +36,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'Product Hunt Today Popular', link: 'https://www.producthunt.com/', item: items, - }; + }); }; diff --git a/lib/v2/ps/monthly-games.js b/lib/v2/ps/monthly-games.js index 978a79c8a6..8b48490688 100644 --- a/lib/v2/ps/monthly-games.js +++ b/lib/v2/ps/monthly-games.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const path = require('path'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; module.exports = async (ctx) => { const baseUrl = 'https://www.playstation.com/en-sg/ps-plus/whats-new/'; const { data: response } = await got(baseUrl); - const $ = cheerio.load(response); + const $ = load(response); const list = $('.cmp-experiencefragment--your-latest-monthly-games .box') .toArray() @@ -23,9 +23,9 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: 'PlayStation Plus Monthly Games', link: baseUrl, item: list, - }; + }); }; diff --git a/lib/v2/ps/trophy.js b/lib/v2/ps/trophy.js index 78f75a163e..28df49fc4e 100644 --- a/lib/v2/ps/trophy.js +++ b/lib/v2/ps/trophy.js @@ -1,15 +1,15 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const response = await got({ method: 'get', url: `https://psnprofiles.com/${id}?order=last-trophy`, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.zebra tr') .filter(function () { return $(this).find('.progress-bar span').text() !== '0%'; @@ -27,7 +27,7 @@ module.exports = async (ctx) => { url: link, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.zebra tr.completed'); const items = list @@ -78,9 +78,9 @@ module.exports = async (ctx) => { } result = result.sort((a, b) => new Date(b.pubDate) - new Date(a.pubDate)); - ctx.state.data = { + ctx.set('data', { title: `${id} 的 PSN 奖杯`, link: `https://psnprofiles.com/${id}/log`, item: result, - }; + }); }; diff --git a/lib/v2/pts/curations.js b/lib/v2/pts/curations.js index c48cc3fcab..fdb468e3a2 100644 --- a/lib/v2/pts/curations.js +++ b/lib/v2/pts/curations.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -13,7 +13,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const items = $('.project-intro') .last() @@ -34,11 +34,11 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('title') .text() .replace(/第\d+頁 ｜ /, ''), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/pts/index.js b/lib/v2/pts/index.js index 38b16a0e32..6f340c47c1 100644 --- a/lib/v2/pts/index.js +++ b/lib/v2/pts/index.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -14,10 +14,10 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('h2 a') - .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 30) + .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 30) .toArray() .map((item) => { item = $(item); @@ -36,7 +36,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.author = content('.reporter-container a') .toArray() @@ -58,11 +58,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title') .text() .replace(/第\d+頁 ｜ /, ''), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/pts/live.js b/lib/v2/pts/live.js index 0813872874..28e505d618 100644 --- a/lib/v2/pts/live.js +++ b/lib/v2/pts/live.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const rootUrl = 'https://news.pts.org.tw'; const currentUrl = `${rootUrl}/live/${id}`; @@ -16,7 +16,7 @@ module.exports = async (ctx) => { url: apiUrl, }); - let items = response.data.data.blogArticleList.slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 30).map((item) => ({ + let items = response.data.data.blogArticleList.slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 30).map((item) => ({ link: `${rootUrl}/live/api/liveblog/article?articleId=${item}&model=main`, })); @@ -41,9 +41,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `公視新聞網 PNN - ${response.data.data.title.replace(/【不斷更新】/, '')}`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/pts/projects.js b/lib/v2/pts/projects.js index 93198627d2..bfe3b6c087 100644 --- a/lib/v2/pts/projects.js +++ b/lib/v2/pts/projects.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -13,7 +13,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const items = $('h3 a') .toArray() @@ -34,11 +34,11 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('title') .text() .replace(/第\d+頁 ｜ /, ''), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/pubmed/trending.js b/lib/v2/pubmed/trending.js index adb0fae2e0..c5a66214d0 100644 --- a/lib/v2/pubmed/trending.js +++ b/lib/v2/pubmed/trending.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { - const filters = ctx.params.filters; + const filters = ctx.req.param('filters'); const rootUrl = 'https://pubmed.ncbi.nlm.nih.gov'; const currentUrl = `${rootUrl}/trending${filters ? `?filter=${filters.replaceAll(',', '&filter=')}` : ''}`; @@ -15,7 +15,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('a[data-article-id]') .toArray() @@ -36,7 +36,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.doi = content('meta[name="citation_doi"]').attr('content'); item.pubDate = parseDate(content('meta[name="citation_date"]').attr('content')); @@ -50,9 +50,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'Trending page - PubMed', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/pumc/mdadmission.js b/lib/v2/pumc/mdadmission.js index 5425a76661..c4c4dc3bad 100644 --- a/lib/v2/pumc/mdadmission.js +++ b/lib/v2/pumc/mdadmission.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 100; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 100; const rootUrl = 'https://mdadmission.pumc.edu.cn'; const currentUrl = `${rootUrl}/mdweb/site!noticeList?param.infoTypeId=&rows=${limit}&pages=1`; @@ -16,7 +16,7 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('div.media') .toArray() @@ -43,7 +43,7 @@ module.exports = async (ctx) => { }, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); content('h3').remove(); @@ -54,9 +54,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '北京协和医学院招生网 - 通知公告', link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/putty/changes.js b/lib/v2/putty/changes.js index 393b9d2901..d47a97c8b0 100644 --- a/lib/v2/putty/changes.js +++ b/lib/v2/putty/changes.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const rootUrl = 'https://www.chiark.greenend.org.uk'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data.replaceAll('href="releases', 'class="version" href="releases')); + const $ = load(response.data.replaceAll('href="releases', 'class="version" href="releases')); const items = $('.version') .toArray() @@ -28,9 +28,9 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/pwc/sustainability.js b/lib/v2/pwc/sustainability.js index 0dd381c038..6c1bf2813f 100644 --- a/lib/v2/pwc/sustainability.js +++ b/lib/v2/pwc/sustainability.js @@ -1,13 +1,14 @@ -const cheerio = require('cheerio'); +import { load } from 'cheerio'; const logger = require('@/utils/logger'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; +import puppeteer from '@/utils/puppeteer'; module.exports = async (ctx) => { const baseUrl = 'https://www.strategyand.pwc.com/at/en/functions/sustainability-strategy/publications.html'; const feedLang = 'en'; const feedDescription = 'Sustainability Publications from PwC Strategy&'; - const browser = await require('@/utils/puppeteer')(); + const browser = puppeteer(); const page = await browser.newPage(); logger.http(`Requesting ${baseUrl}`); await page.setRequestInterception(true); @@ -20,7 +21,7 @@ module.exports = async (ctx) => { const response = await page.content(); page.close(); - const $ = cheerio.load(response); + const $ = load(response); const list = $('div#wrapper article') .toArray() @@ -48,11 +49,11 @@ module.exports = async (ctx) => { browser.close(); - ctx.state.data = { + ctx.set('data', { title: 'PwC Strategy& - Sustainability Publications', link: baseUrl, language: feedLang, description: feedDescription, item: items, - }; + }); }; diff --git a/lib/v2/qbitai/category.js b/lib/v2/qbitai/category.js index 291bd9b1ad..606b33792a 100644 --- a/lib/v2/qbitai/category.js +++ b/lib/v2/qbitai/category.js @@ -1,6 +1,6 @@ const parser = require('@/utils/rss-parser'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const { category } = ctx.params; @@ -16,12 +16,12 @@ module.exports = async (ctx) => { description: item['content:encoded'], })); - ctx.state.data = { + ctx.set('data', { // 源标题 title: `量子位-${category}`, // 源链接 link: `https://www.qbitai.com/category/${category}`, // 源文章 item: items, - }; + }); }; diff --git a/lib/v2/qbitai/tag.js b/lib/v2/qbitai/tag.js index cd0fc9e2e7..6eb5660173 100644 --- a/lib/v2/qbitai/tag.js +++ b/lib/v2/qbitai/tag.js @@ -1,6 +1,6 @@ const parser = require('@/utils/rss-parser'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const { tag } = ctx.params; @@ -16,12 +16,12 @@ module.exports = async (ctx) => { description: item['content:encoded'], })); - ctx.state.data = { + ctx.set('data', { // 源标题 title: `量子位-${tag}`, // 源链接 link: `https://www.qbitai.com/tag/${tag}`, // 源文章 item: items, - }; + }); }; diff --git a/lib/v2/qbittorrent/news.js b/lib/v2/qbittorrent/news.js index 5391adb2a4..9493abdb32 100644 --- a/lib/v2/qbittorrent/news.js +++ b/lib/v2/qbittorrent/news.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const config = require('@/config').value; +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { config } from '@/config'; module.exports = async (ctx) => { const baseUrl = 'https://www.qbittorrent.org'; @@ -20,7 +20,7 @@ module.exports = async (ctx) => { false ); - const $ = cheerio.load(response); + const $ = load(response); const item = $('.stretcher') .find('h3') @@ -45,15 +45,15 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: 'qBittorrent News', link: `${baseUrl}/news.php`, item, - }; + }); - ctx.state.json = { + ctx.set('json', { title: 'qBittorrent News', link: `${baseUrl}/news.php`, item, - }; + }); }; diff --git a/lib/v2/qdu/houqin.js b/lib/v2/qdu/houqin.js index 12bf0f03b0..b397e6ec21 100644 --- a/lib/v2/qdu/houqin.js +++ b/lib/v2/qdu/houqin.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const base = 'https://houqin.qdu.edu.cn/'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { url: `${base}index/tzgg.htm`, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.n_newslist').children(); const items = await Promise.all( list.map((i, item) => { @@ -23,7 +23,7 @@ module.exports = async (ctx) => { return ctx.cache.tryGet(itemUrl, async () => { let description = ''; const result = await got(itemUrl); - const $ = cheerio.load(result.data); + const $ = load(result.data); if ( $('.article_body') .find('div > h4') @@ -54,10 +54,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '青岛大学 - 后勤管理处通知', link: `${base}index/tzgg.htm`, description: '青岛大学 - 后勤管理处通知', item: items, - }; + }); }; diff --git a/lib/v2/qdu/jwc.js b/lib/v2/qdu/jwc.js index c199ebf3e6..5fb81c040a 100644 --- a/lib/v2/qdu/jwc.js +++ b/lib/v2/qdu/jwc.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const base = 'https://jwc.qdu.edu.cn/'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { url: `${base}jwtz.htm`, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.notice_item').children(); const items = await Promise.all( list.map((i, item) => { @@ -27,7 +27,7 @@ module.exports = async (ctx) => { description = itemTitle; } else { const result = await got(itemUrl); - const $ = cheerio.load(result.data); + const $ = load(result.data); description = $('title').text() === '系统提示' ? itemTitle // 内网限制访问内容，仅返回标题 @@ -43,10 +43,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '青岛大学 - 教务处通知', link: `${base}jwtz.htm`, description: '青岛大学 - 教务处通知', item: items, - }; + }); }; diff --git a/lib/v2/qianp/news.js b/lib/v2/qianp/news.js index 8ab55c8eea..134db2e608 100644 --- a/lib/v2/qianp/news.js +++ b/lib/v2/qianp/news.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { getTokenAndSecret } = require('./utils'); module.exports = async (ctx) => { @@ -15,7 +15,7 @@ module.exports = async (ctx) => { const { data: response } = await got(url, { headers, }); - const $ = cheerio.load(response); + const $ = load(response); const list = $('.newslist .infor') .toArray() @@ -34,7 +34,7 @@ module.exports = async (ctx) => { const { data: response } = await got(item.link, { headers, }); - const $ = cheerio.load(response); + const $ = load(response); item.category = [...new Set($('meta[name=keywords]').attr('content').split('，'))]; item.author = $('meta[name=author]').attr('content'); @@ -47,11 +47,11 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), description: $('meta[name="description"]').attr('content'), link: url, image: `${baseUrl}/favicon.ico`, item: items, - }; + }); }; diff --git a/lib/v2/qianp/utils.js b/lib/v2/qianp/utils.js index ab274f5cfd..0101fd22c0 100644 --- a/lib/v2/qianp/utils.js +++ b/lib/v2/qianp/utils.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const getTokenAndSecret = (tryGet) => tryGet('qianp:token', async () => { diff --git a/lib/v2/qianzhan/column.js b/lib/v2/qianzhan/column.js index 5655db8d63..82dc3d0ca8 100644 --- a/lib/v2/qianzhan/column.js +++ b/lib/v2/qianzhan/column.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { let rootUrl = 'https://www.qianzhan.com/analyst/'; @@ -18,14 +18,14 @@ module.exports = async (ctx) => { } const response = await got(rootUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const links = $('.ptb30.bb1e.clf .f22 a').map((_, item) => $(item).attr('href')); const items = await Promise.all( links.map((_, item) => ctx.cache.tryGet(item, async () => { const detailResponse = await got(item); - const $ = cheerio.load(detailResponse.data); + const $ = load(detailResponse.data); const description = $('#divArtBody').html(); const title = $('#h_title').text(); const pubDate = timezone(parseDate($('#pubtime_baidu').text().split('• ')[1], 'YYYY-MM-DD HH:mm:ss'), +8); @@ -42,9 +42,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `前瞻经济学人 - ${titles[type]}`, link: rootUrl, item: items, - }; + }); }; diff --git a/lib/v2/qianzhan/rank.js b/lib/v2/qianzhan/rank.js index cd5115952b..66dfb88723 100644 --- a/lib/v2/qianzhan/rank.js +++ b/lib/v2/qianzhan/rank.js @@ -1,21 +1,21 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { - const type = ctx.params.type === 'week' ? 1 : 2; + const type = ctx.req.param('type') === 'week' ? 1 : 2; const rootUrl = 'https://www.qianzhan.com/analyst/'; const response = await got(rootUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const links = $(`#div_hotlist ul[idx='${type}'] a`).map((_, item) => $(item).attr('href')); const items = await Promise.all( links.map((_, item) => ctx.cache.tryGet(item, async () => { const detailResponse = await got(item); - const $ = cheerio.load(detailResponse.data); + const $ = load(detailResponse.data); const description = $('#divArtBody').html(); const title = $('#h_title').text(); const pubDate = timezone(parseDate($('#pubtime_baidu').text().split('• ')[1], 'YYYY-MM-DD HH:mm:ss'), +8); @@ -32,9 +32,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `前瞻经济学人 - ${type === 1 ? '周排行' : '月排行'}`, link: rootUrl, item: items, - }; + }); }; diff --git a/lib/v2/qidian/author.js b/lib/v2/qidian/author.js index 8b515f0da2..6747f9815d 100644 --- a/lib/v2/qidian/author.js +++ b/lib/v2/qidian/author.js @@ -1,16 +1,16 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { parseDate, parseRelativeDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); -const timezone = require('@/utils/timezone'); +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const rootUrl = 'https://my.qidian.com'; const currentUrl = `${rootUrl}/author/${id}/`; const response = await got(currentUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const authorName = $('.header-msg h1').contents().first().text().trim(); const items = $('.author-work .author-item') .toArray() @@ -32,10 +32,10 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: `${authorName} - 起点中文网`, description: $('.header-msg-desc').text().trim(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/qidian/chapter.js b/lib/v2/qidian/chapter.js index ef23ba5760..02ebe0efe3 100644 --- a/lib/v2/qidian/chapter.js +++ b/lib/v2/qidian/chapter.js @@ -1,18 +1,18 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const response = await got(`https://m.qidian.com/book/${id}.html`); - const $ = cheerio.load(response.data); + const $ = load(response.data); const name = $('meta[property="og:title"]').attr('content'); const coverUrl = `https:${$('.detail__header-cover__img').attr('src')}`; const { data: catalog } = await got(`https://m.qidian.com/book/${id}/catalog/`); - const $c = cheerio.load(catalog); + const $c = load(catalog); const { pageContext } = JSON.parse($c('#vite-plugin-ssr_pageContext').text()); const chapterItem = pageContext.pageProps.pageData.vs @@ -23,11 +23,11 @@ module.exports = async (ctx) => { link: `https://vipreader.qidian.com/chapter/${id}/${c.id}`, })); - ctx.state.data = { + ctx.set('data', { title: `起点 ${name}`, link: `https://book.qidian.com/info/${id}`, description: $('#bookSummary content').text(), image: coverUrl, item: chapterItem, - }; + }); }; diff --git a/lib/v2/qidian/forum.js b/lib/v2/qidian/forum.js index 657debca71..e6662c6a1a 100644 --- a/lib/v2/qidian/forum.js +++ b/lib/v2/qidian/forum.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseRelativeDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseRelativeDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const url = `https://forum.qidian.com/NewForum/List.aspx?BookId=${id}`; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(forum_response.data); + const $ = load(forum_response.data); const name = $('.main-header>h1').text(); const cover_url = $('img.forum_book').attr('src'); const list = $('li.post-wrap>.post'); @@ -29,10 +29,10 @@ module.exports = async (ctx) => { }); } - ctx.state.data = { + ctx.set('data', { title: `起点 《${name}》讨论区`, link: url, image: cover_url, item: items, - }; + }); }; diff --git a/lib/v2/qidian/free-next.js b/lib/v2/qidian/free-next.js index 5643035c4c..5b4c9660cf 100644 --- a/lib/v2/qidian/free-next.js +++ b/lib/v2/qidian/free-next.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); let link, title; if (type === 'mm') { @@ -14,7 +14,7 @@ module.exports = async (ctx) => { } const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('div.other-rec-wrap li'); const out = list @@ -33,10 +33,10 @@ module.exports = async (ctx) => { }) .get(); - ctx.state.data = { + ctx.set('data', { title, description: `限时免费下期预告-${title}`, link, item: out, - }; + }); }; diff --git a/lib/v2/qidian/free.js b/lib/v2/qidian/free.js index 7abeeb485c..2e93a8c1e8 100644 --- a/lib/v2/qidian/free.js +++ b/lib/v2/qidian/free.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseRelativeDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseRelativeDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); let link, title; if (type === 'mm') { @@ -15,7 +15,7 @@ module.exports = async (ctx) => { } const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('#limit-list li'); const out = list @@ -36,10 +36,10 @@ module.exports = async (ctx) => { }) .get(); - ctx.state.data = { + ctx.set('data', { title, description: `限时免费-${title}`, link, item: out, - }; + }); }; diff --git a/lib/v2/qingting/channel.js b/lib/v2/qingting/channel.js index d7d48962b4..5220566153 100644 --- a/lib/v2/qingting/channel.js +++ b/lib/v2/qingting/channel.js @@ -1,23 +1,23 @@ -const got = require('@/utils/got'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const channelUrl = `https://i.qingting.fm/capi/v3/channel/${ctx.params.id}`; + const channelUrl = `https://i.qingting.fm/capi/v3/channel/${ctx.req.param('id')}`; let response = await got(channelUrl); const title = response.data.data.title; - const programUrl = `https://i.qingting.fm/capi/channel/${ctx.params.id}/programs/${response.data.data.v}?curpage=1&pagesize=10&order=asc`; + const programUrl = `https://i.qingting.fm/capi/channel/${ctx.req.param('id')}/programs/${response.data.data.v}?curpage=1&pagesize=10&order=asc`; response = await got(programUrl); const items = response.data.data.programs.map((item) => ({ title: item.title, - link: `https://www.qingting.fm/channels/${ctx.params.id}/programs/${item.id}/`, + link: `https://www.qingting.fm/channels/${ctx.req.param('id')}/programs/${item.id}/`, pubDate: timezone(parseDate(item.update_time), +8), })); - ctx.state.data = { + ctx.set('data', { title: `${title} - 蜻蜓FM`, - link: `https://www.qingting.fm/channels/${ctx.params.id}`, + link: `https://www.qingting.fm/channels/${ctx.req.param('id')}`, item: await Promise.all( items.map((item) => ctx.cache.tryGet(item.link, async () => { @@ -28,5 +28,5 @@ module.exports = async (ctx) => { }) ) ), - }; + }); }; diff --git a/lib/v2/qingting/podcast.js b/lib/v2/qingting/podcast.js index 7d148a6d47..0e53e344ca 100644 --- a/lib/v2/qingting/podcast.js +++ b/lib/v2/qingting/podcast.js @@ -1,10 +1,10 @@ const crypto = require('crypto'); -const got = require('@/utils/got'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const channelUrl = `https://i.qingting.fm/capi/v3/channel/${ctx.params.id}`; + const channelUrl = `https://i.qingting.fm/capi/v3/channel/${ctx.req.param('id')}`; let response = await got({ method: 'get', url: channelUrl, @@ -16,7 +16,7 @@ module.exports = async (ctx) => { const channel_img = response.data.data.thumbs['400_thumb']; const authors = response.data.data.podcasters.map((author) => author.nick_name).join(','); const desc = response.data.data.description; - const programUrl = `https://i.qingting.fm/capi/channel/${ctx.params.id}/programs/${response.data.data.v}?curpage=1&pagesize=10&order=asc`; + const programUrl = `https://i.qingting.fm/capi/channel/${ctx.req.param('id')}/programs/${response.data.data.v}?curpage=1&pagesize=10&order=asc`; response = await got({ method: 'get', url: programUrl, @@ -27,10 +27,10 @@ module.exports = async (ctx) => { const resultItems = await Promise.all( response.data.data.programs.map((item) => - ctx.cache.tryGet(`qingting:podcast:${ctx.params.id}:${item.id}`, async () => { - const link = `https://www.qingting.fm/channels/${ctx.params.id}/programs/${item.id}/`; + ctx.cache.tryGet(`qingting:podcast:${ctx.req.param('id')}:${item.id}`, async () => { + const link = `https://www.qingting.fm/channels/${ctx.req.param('id')}/programs/${item.id}/`; - const path = `/audiostream/redirect/${ctx.params.id}/${item.id}?access_token=&device_id=MOBILESITE&qingting_id=&t=${Date.now()}`; + const path = `/audiostream/redirect/${ctx.req.param('id')}/${item.id}?access_token=&device_id=MOBILESITE&qingting_id=&t=${Date.now()}`; const sign = crypto.createHmac('md5', 'fpMn12&38f_2e').update(path).digest('hex').toString(); const [detailRes, mediaRes] = await Promise.all([ @@ -66,12 +66,12 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${title} - 蜻蜓FM`, description: desc, itunes_author: authors, image: channel_img, - link: `https://www.qingting.fm/channels/${ctx.params.id}`, + link: `https://www.qingting.fm/channels/${ctx.req.param('id')}`, item: resultItems, - }; + }); }; diff --git a/lib/v2/qipamaijia/index.js b/lib/v2/qipamaijia/index.js index f58b56c8d8..23787e85c6 100644 --- a/lib/v2/qipamaijia/index.js +++ b/lib/v2/qipamaijia/index.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const rootUrl = 'https://www.qipamaijia.com'; module.exports = async (ctx) => { - const cate = ctx.params.cate ?? ''; + const cate = ctx.req.param('cate') ?? ''; const url = `${rootUrl}/${cate}`; const response = await got({ @@ -14,7 +14,7 @@ module.exports = async (ctx) => { rejectUnauthorized: false, }, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const title = $('#highlight').text(); const items = $('div.col_l > div.block') .map((_index, item) => ({ @@ -24,9 +24,9 @@ module.exports = async (ctx) => { })) .get(); - ctx.state.data = { + ctx.set('data', { title: `奇葩买家秀 - ${title}`, link: url, item: items, - }; + }); }; diff --git a/lib/v2/qiyoujiage/price.js b/lib/v2/qiyoujiage/price.js index b2926700f0..54bf80fc7f 100644 --- a/lib/v2/qiyoujiage/price.js +++ b/lib/v2/qiyoujiage/price.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const md5 = require('@/utils/md5'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import md5 from '@/utils/md5'; module.exports = async (ctx) => { const { path } = ctx.params; const link = `http://www.qiyoujiage.com/${path}.shtml`; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const priceText = $('#youjia').text(); const item = [ @@ -19,10 +19,10 @@ module.exports = async (ctx) => { }, ]; - ctx.state.data = { + ctx.set('data', { title: $('title').text(), description: $('meta[name="Description"]').attr('content'), link, item, - }; + }); }; diff --git a/lib/v2/qlu/notice.js b/lib/v2/qlu/notice.js index 648c3f4955..ba47ea798a 100644 --- a/lib/v2/qlu/notice.js +++ b/lib/v2/qlu/notice.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; const host = 'https://www.qlu.edu.cn'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { url: `${host}/tzggsh/list1.htm`, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('ul.news_list.list2').children(); const items = await Promise.all( @@ -27,7 +27,7 @@ module.exports = async (ctx) => { description = itemTitle; } else { const result = await got(itemUrl); - const $ = cheerio.load(result.data); + const $ = load(result.data); description = $('.read').html().trim(); } return { @@ -40,10 +40,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: `齐鲁工业大学 - 通知公告`, link: `${host}/tzggsh/list1.htm`, description: '齐鲁工业大学 - 通知公告', item: items, - }; + }); }; diff --git a/lib/v2/qm120/news.js b/lib/v2/qm120/news.js index 492d8b06c3..fbce6e1232 100644 --- a/lib/v2/qm120/news.js +++ b/lib/v2/qm120/news.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const category = ctx.params.category ?? 'jdxw'; + const category = ctx.req.param('category') ?? 'jdxw'; const rootUrl = 'http://www.qm120.com'; const currentUrl = `${rootUrl}/news/${category}`; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.lb2boxls ul li a') .toArray() @@ -32,7 +32,7 @@ module.exports = async (ctx) => { method: 'get', url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('.neirong_body').html(); item.pubDate = timezone(parseDate(content('.neirong_head p span').eq(1).text()), +8); @@ -42,9 +42,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${$('.zt_liebiao_tit').text()} - 全民健康网`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/apps/card.js b/lib/v2/qoo-app/apps/card.js index 30809e1078..f03ef64839 100644 --- a/lib/v2/qoo-app/apps/card.js +++ b/lib/v2/qoo-app/apps/card.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { appsUrl } = require('../utils'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const link = `${appsUrl}${lang ? `/${lang}` : ''}/app-card/${id}`; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const items = $('.qoo-post-item') .toArray() @@ -29,10 +29,10 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/apps/comment.js b/lib/v2/qoo-app/apps/comment.js index 78fa1afe6c..b0a851e5b6 100644 --- a/lib/v2/qoo-app/apps/comment.js +++ b/lib/v2/qoo-app/apps/comment.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { appsUrl } = require('../utils'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -15,7 +15,7 @@ module.exports = async (ctx) => { sort: 'create', }, }); - const $ = cheerio.load(response); + const $ = load(response); const items = $('.qoo-post-item') .toArray() @@ -34,10 +34,10 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/apps/note.js b/lib/v2/qoo-app/apps/note.js index 8d911f96df..3855decdaf 100644 --- a/lib/v2/qoo-app/apps/note.js +++ b/lib/v2/qoo-app/apps/note.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { appsUrl } = require('../utils'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const link = `${appsUrl}${lang ? `/${lang}` : ''}/app-note/${id}`; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const list = $('.qoo-note-wrap') .toArray() @@ -28,7 +28,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const { data: response } = await got(item.link); - const $ = cheerio.load(response); + const $ = load(response); $('footer').remove(); item.description = $('article .content').html(); @@ -38,10 +38,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/apps/post.js b/lib/v2/qoo-app/apps/post.js index c7f1b5f8af..450915af5d 100644 --- a/lib/v2/qoo-app/apps/post.js +++ b/lib/v2/qoo-app/apps/post.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { appsUrl, newsUrl, fixImg } = require('../utils'); module.exports = async (ctx) => { @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const link = `${appsUrl}${lang ? `/${lang}` : ''}/app-post/${id}`; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const list = $('.qoo-post-item') .toArray() @@ -30,7 +30,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const { data } = await got(`${newsUrl}${lang ? `/${lang}` : ''}/wp-json/wp/v2/posts/${item.postId}`); - const $ = cheerio.load(data.content.rendered, null, false); + const $ = load(data.content.rendered, null, false); fixImg($); @@ -42,10 +42,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/news.js b/lib/v2/qoo-app/news.js index d628b7e03e..c552979b48 100644 --- a/lib/v2/qoo-app/news.js +++ b/lib/v2/qoo-app/news.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { newsUrl, siteIcon, fixImg } = require('./utils'); @@ -10,12 +10,12 @@ module.exports = async (ctx) => { const { data } = await got(apiUrl, { searchParams: { - per_page: ctx.query.limit ? Number.parseInt(ctx.query.limit) : 100, + per_page: ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 100, }, }); const items = data.map((item) => { - const $ = cheerio.load(item.content.rendered, null, false); + const $ = load(item.content.rendered, null, false); fixImg($); @@ -27,7 +27,7 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: 'QooApp : Anime Game Platform', description: lang === 'en' @@ -37,5 +37,5 @@ module.exports = async (ctx) => { link: `${newsUrl}${lang ? `/${lang}` : ''}`, language: lang === 'en' ? 'en' : 'zh', item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/notes/note.js b/lib/v2/qoo-app/notes/note.js index 6e7bb12ae3..8d68a71276 100644 --- a/lib/v2/qoo-app/notes/note.js +++ b/lib/v2/qoo-app/notes/note.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { ssoUrl, notesUrl } = require('../utils'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -11,13 +11,13 @@ module.exports = async (ctx) => { const link = `${notesUrl}/note/${id}`; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const { data } = await got(api, { searchParams: { sort: 'newest', for: 'web', - limit: ctx.query.limit ? Number.parseInt(ctx.query.limit) : 100, + limit: ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 100, type: 'note', object_id: id, }, @@ -34,10 +34,10 @@ module.exports = async (ctx) => { guid: `qoo-app:notes:note:${id}:${item.id}`, })); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/notes/topic.js b/lib/v2/qoo-app/notes/topic.js index 0f99cba5dd..5110fb6efb 100644 --- a/lib/v2/qoo-app/notes/topic.js +++ b/lib/v2/qoo-app/notes/topic.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { notesUrl, extractNotes } = require('../utils'); module.exports = async (ctx) => { @@ -7,14 +7,14 @@ module.exports = async (ctx) => { const link = `${notesUrl}${lang ? `/${lang}` : ''}/topic/${topic}`; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const items = extractNotes($); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/notes/user.js b/lib/v2/qoo-app/notes/user.js index cd721fd8ec..92f9040df9 100644 --- a/lib/v2/qoo-app/notes/user.js +++ b/lib/v2/qoo-app/notes/user.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { notesUrl, extractNotes } = require('../utils'); module.exports = async (ctx) => { @@ -7,14 +7,14 @@ module.exports = async (ctx) => { const link = `${notesUrl}${lang ? `/${lang}` : ''}/user/${uid}`; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const items = extractNotes($); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/user/app-comment.js b/lib/v2/qoo-app/user/app-comment.js index 14fbf0ad53..641c10ea3f 100644 --- a/lib/v2/qoo-app/user/app-comment.js +++ b/lib/v2/qoo-app/user/app-comment.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { userUrl, appsUrl } = require('../utils'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -17,7 +17,7 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(response); + const $ = load(response); const username = $('.person .name').text(); const items = data.list.map((item) => ({ @@ -31,11 +31,11 @@ module.exports = async (ctx) => { author: username, })); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), link, image: decodeURIComponent($('.person div.slot').attr('data-args')).replace('avatar=', '').split('?')[0], language: $('html').attr('lang'), item: items, - }; + }); }; diff --git a/lib/v2/qoo-app/utils.js b/lib/v2/qoo-app/utils.js index f47f4d9391..2451a1fcdd 100644 --- a/lib/v2/qoo-app/utils.js +++ b/lib/v2/qoo-app/utils.js @@ -1,5 +1,5 @@ -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const appsUrl = 'https://apps.qoo-app.com'; const newsUrl = 'https://news.qoo-app.com'; diff --git a/lib/v2/qq/ac/comic.js b/lib/v2/qq/ac/comic.js index 3d8429e53f..12dc5233e0 100644 --- a/lib/v2/qq/ac/comic.js +++ b/lib/v2/qq/ac/comic.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { rootUrl, mobileRootUrl } = require('./utils'); module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const currentUrl = `${rootUrl}/Comic/comicInfo/id/${id}`; const mobileCurrentUrl = `${mobileRootUrl}/comic/index/id/${id}`; @@ -14,7 +14,7 @@ module.exports = async (ctx) => { url: mobileCurrentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const author = $('.author-wr') .toArray() @@ -34,10 +34,10 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: `${$('h1').text()} - 腾讯动漫`, link: currentUrl, item: items, description: `
${$('.head-info-desc').text()}
`, - }; + }); }; diff --git a/lib/v2/qq/ac/rank.js b/lib/v2/qq/ac/rank.js index 9093d263e9..f9e9865f96 100644 --- a/lib/v2/qq/ac/rank.js +++ b/lib/v2/qq/ac/rank.js @@ -11,8 +11,8 @@ module.exports = async (ctx) => { female: '女生榜', }; - const type = ctx.params.type ?? 'mt'; - const time = ctx.params.time ?? 'cur'; + const type = ctx.req.param('type') ?? 'mt'; + const time = ctx.req.param('time') ?? 'cur'; const currentUrl = `${rootUrl}/Rank/comicRank/type/${type}`; diff --git a/lib/v2/qq/ac/utils.js b/lib/v2/qq/ac/utils.js index df3af92f2f..f8fa90dfa1 100644 --- a/lib/v2/qq/ac/utils.js +++ b/lib/v2/qq/ac/utils.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { art } from '@/utils/render'; const path = require('path'); const rootUrl = 'https://ac.qq.com'; @@ -15,10 +15,10 @@ module.exports = { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $(`${time ? `.${time}-month-data ` : ''}.text-overflow`) - .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 30) + .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 30) .toArray() .map((item) => { item = $(item); @@ -38,7 +38,7 @@ module.exports = { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.link = item.guid; item.author = content('.author-wr') diff --git a/lib/v2/qq/fact/index.js b/lib/v2/qq/fact/index.js index 7b6b2a8bd7..45512d82f9 100644 --- a/lib/v2/qq/fact/index.js +++ b/lib/v2/qq/fact/index.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { load } from 'cheerio'; const CryptoJS = require('crypto-js'); -const { art } = require('@/utils/render'); +import { art } from '@/utils/render'; const path = require('path'); const getRequestToken = () => { @@ -38,7 +38,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const nextData = JSON.parse($('#__NEXT_DATA__').text()); const { initialState } = nextData.props.pageProps; @@ -53,9 +53,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '较真查证平台 - 腾讯新闻', link: `${baseUrl}/home`, item: items, - }; + }); }; diff --git a/lib/v2/qq/kg/cache.js b/lib/v2/qq/kg/cache.js index e3241eb489..4e6db07474 100644 --- a/lib/v2/qq/kg/cache.js +++ b/lib/v2/qq/kg/cache.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { JSDOM } = require('jsdom'); module.exports = { diff --git a/lib/v2/qq/kg/reply.js b/lib/v2/qq/kg/reply.js index 35bffe0068..78909cb301 100644 --- a/lib/v2/qq/kg/reply.js +++ b/lib/v2/qq/kg/reply.js @@ -1,12 +1,12 @@ const cache = require('./cache'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const playId = ctx.params.playId; + const playId = ctx.req.param('playId'); const url = `https://node.kg.qq.com/play?s=${playId}`; const play_item = await cache.getPlayInfo(ctx, playId, ''); - ctx.state.data = { + ctx.set('data', { title: `${play_item.name} - ${play_item.author} 的评论`, link: url, image: play_item.itunes_item_image, @@ -17,5 +17,5 @@ module.exports = async (ctx) => { link: url, guid: `ksong:${play_item.ksong_mid}:${item.comment_id}`, })), - }; + }); }; diff --git a/lib/v2/qq/kg/user.js b/lib/v2/qq/kg/user.js index 8194507571..caac932c31 100644 --- a/lib/v2/qq/kg/user.js +++ b/lib/v2/qq/kg/user.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { JSDOM } = require('jsdom'); const cache = require('./cache'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const userId = ctx.params.userId; + const userId = ctx.req.param('userId'); const url = `https://node.kg.qq.com/personal?uid=${userId}`; const response = await got(url); @@ -37,7 +37,7 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: `${author} - 全民K歌`, link: url, description: data.share.content, @@ -46,5 +46,5 @@ module.exports = async (ctx) => { image: authorimg, itunes_author: author, itunes_category: '全民K歌', - }; + }); }; diff --git a/lib/v2/qq88/index.js b/lib/v2/qq88/index.js index 5bc35a9f3b..b478119157 100644 --- a/lib/v2/qq88/index.js +++ b/lib/v2/qq88/index.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const category = ctx.params.category ?? ''; + const category = ctx.req.param('category') ?? ''; const rootUrl = 'https://qq88.info'; const currentUrl = category ? `${rootUrl}/?cat=${category}` : rootUrl; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.entry-title a') .slice(0, 15) @@ -35,7 +35,7 @@ module.exports = async (ctx) => { method: 'get', url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); const links = content('.entry-content').find('a[download]'); @@ -52,9 +52,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${$('.page-title').text() || '首页'} - 秋爸日字`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/qqorw/index.js b/lib/v2/qqorw/index.js index efc7c13912..773a080518 100644 --- a/lib/v2/qqorw/index.js +++ b/lib/v2/qqorw/index.js @@ -1,18 +1,18 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const { category = '' } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 10; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 10; const rootUrl = 'https://qqorw.cn'; const currentUrl = new URL(category, rootUrl).href; const { data: response } = await got(currentUrl); - const $ = cheerio.load(response); + const $ = load(response); let items = $('article.excerpt') .slice(0, limit) @@ -40,7 +40,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(item.link, async () => { const { data: detailResponse } = await got(item.link); - const content = cheerio.load(detailResponse); + const content = load(detailResponse); content('div.contenttxt').prev().nextAll().remove(); @@ -62,7 +62,7 @@ module.exports = async (ctx) => { const icon = new URL('favicon.ico', rootUrl).href; const title = $('header.archive-header h1 a').last().text(); - ctx.state.data = { + ctx.set('data', { item: items, title: `${author}${title ? ` - ${title}` : ''}`, link: currentUrl, @@ -73,5 +73,5 @@ module.exports = async (ctx) => { logo: icon, subtitle: $('meta[name="keywords"]').prop('content'), author, - }; + }); }; diff --git a/lib/v2/questmobile/report.js b/lib/v2/questmobile/report.js index 6700b676f6..fb22b93f0d 100644 --- a/lib/v2/questmobile/report.js +++ b/lib/v2/questmobile/report.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); /** @@ -26,7 +26,7 @@ const parseTree = (tree, result = []) => { module.exports = async (ctx) => { const { industry, label } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 50; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 50; const rootUrl = 'https://www.questmobile.com.cn'; const apiUrl = new URL('api/v2/report/article-list', rootUrl).href; @@ -80,7 +80,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(item.link, async () => { const { data: detailResponse } = await got(item.link); - const content = cheerio.load(detailResponse); + const content = load(detailResponse); content('div.text div.daoyu').remove(); @@ -104,14 +104,14 @@ module.exports = async (ctx) => { const { data: currentResponse } = await got(currentUrl); - const $ = cheerio.load(currentResponse); + const $ = load(currentResponse); const author = $('meta[property="og:title"]').prop('content').split(/-/)[0]; const categories = [industryObj?.value, labelObj?.value].filter(Boolean); const image = $(`img[alt="${author}"]`).prop('src'); const icon = $('link[rel="shortcut icon"]').prop('href'); - ctx.state.data = { + ctx.set('data', { item: items, title: `${author}${categories.length === 0 ? '' : ` - ${categories.join(' - ')}`}`, link: currentUrl, @@ -123,5 +123,5 @@ module.exports = async (ctx) => { subtitle: $('meta[name="keywords"]').prop('content'), author, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/quicker/qa.js b/lib/v2/quicker/qa.js index 28dc7d9e6b..98b732d97c 100644 --- a/lib/v2/quicker/qa.js +++ b/lib/v2/quicker/qa.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; const { parseDate, parseRelativeDate } = require('@/utils/parse-date'); module.exports = async (ctx) => { - const category = ctx.params.category ?? 'all'; - const state = ctx.params.state ?? ''; + const category = ctx.req.param('category') ?? 'all'; + const state = ctx.req.param('state') ?? ''; const rootUrl = 'https://getquicker.net'; const currentUrl = `${rootUrl}/QA${category === 'all' ? '' : `?category=${category}`}${state ? `?state=${state}` : ''}`; @@ -15,10 +15,10 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('a.question-title') - .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 25) + .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 25) .toArray() .map((item) => { item = $(item); @@ -37,7 +37,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); content('div[data-note="最后更新人信息"]').remove(); @@ -56,10 +56,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/quicker/share.js b/lib/v2/quicker/share.js index 8c16cb06d6..623bf86b36 100644 --- a/lib/v2/quicker/share.js +++ b/lib/v2/quicker/share.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; const { parseDate, parseRelativeDate } = require('@/utils/parse-date'); module.exports = async (ctx) => { - const category = ctx.params.category ?? 'Recent'; + const category = ctx.req.param('category') ?? 'Recent'; const rootUrl = 'https://getquicker.net'; const currentUrl = `${rootUrl}/Share/${category}`; @@ -14,10 +14,10 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('table tbody tr') - .slice(1, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 25) + .slice(1, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 25) .toArray() .map((item) => { item = $(item).find('td a').first(); @@ -36,7 +36,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); content('section').last().remove(); content('#app').children().slice(0, 2).remove(); @@ -52,10 +52,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/quicker/user.js b/lib/v2/quicker/user.js index cdbedcc0b1..8686e79805 100644 --- a/lib/v2/quicker/user.js +++ b/lib/v2/quicker/user.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; const { parseDate, parseRelativeDate } = require('@/utils/parse-date'); module.exports = async (ctx) => { - const category = ctx.params.category; - const id = ctx.params.id; + const category = ctx.req.param('category'); + const id = ctx.req.param('id'); const rootUrl = 'https://getquicker.net'; const currentUrl = `${rootUrl}/User/${category}/${id}`; @@ -15,10 +15,10 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('table tbody tr') - .slice(1, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 25) + .slice(1, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 25) .toArray() .map((item) => { item = $(item).find('td a').first(); @@ -37,7 +37,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); content('section').last().remove(); content('#app').children().slice(0, 2).remove(); @@ -53,10 +53,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/quicker/versions.js b/lib/v2/quicker/versions.js index ece5f7a0e3..1f4e4533d6 100644 --- a/lib/v2/quicker/versions.js +++ b/lib/v2/quicker/versions.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const rootUrl = 'https://getquicker.net'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const items = $('.version') .toArray() @@ -28,9 +28,9 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/qweather/3days.js b/lib/v2/qweather/3days.js index f3f7e8c03a..9f6cf76d74 100644 --- a/lib/v2/qweather/3days.js +++ b/lib/v2/qweather/3days.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); -const config = require('@/config').value; +import { config } from '@/config'; const WEATHER_API = 'https://devapi.qweather.com/v7/weather/3d'; const AIR_QUALITY_API = 'https://devapi.qweather.com/v7/air/5d'; @@ -12,12 +12,12 @@ module.exports = async (ctx) => { if (!config.hefeng.key) { throw new Error('QWeather RSS is disabled due to the lack of relevant config'); } - const id = await ctx.cache.tryGet(ctx.params.location + '_id', async () => { - const response = await got(`${CIRY_LOOKUP_API}?location=${ctx.params.location}&key=${config.hefeng.key}`); + const id = await ctx.cache.tryGet(ctx.req.param('location') + '_id', async () => { + const response = await got(`${CIRY_LOOKUP_API}?location=${ctx.req.param('location')}&key=${config.hefeng.key}`); return response.data.location[0].id; }); const weatherData = await ctx.cache.tryGet( - ctx.params.location, + ctx.req.param('location'), async () => { const response = await got(`${WEATHER_API}?key=${config.hefeng.key}&location=${id}`); return response.data; @@ -26,7 +26,7 @@ module.exports = async (ctx) => { false ); const airQualityData = await ctx.cache.tryGet( - `qweather:air:${ctx.params.location}`, + `qweather:air:${ctx.req.param('location')}`, async () => { const airQualityResponse = await got(`${AIR_QUALITY_API}?location=${id}&key=${config.hefeng.key}`); return airQualityResponse.data; @@ -58,16 +58,16 @@ module.exports = async (ctx) => { item, }), pubDate: combined.updateTime, - guid: '位置：' + ctx.params.location + '--日期：' + item.fxDate, + guid: '位置：' + ctx.req.param('location') + '--日期：' + item.fxDate, link: combined.fxLink, author, })); - ctx.state.data = { - title: ctx.params.location + '未来三天天气', - description: ctx.params.location + '未来三天天气情况，使用和风彩云 API (包括空气质量)', + ctx.set('data', { + title: ctx.req.param('location') + '未来三天天气', + description: ctx.req.param('location') + '未来三天天气情况，使用和风彩云 API (包括空气质量)', item: items, link: combined.fxLink, author, - }; + }); }; diff --git a/lib/v2/qweather/now.js b/lib/v2/qweather/now.js index dabeb667b3..1455ea66ca 100644 --- a/lib/v2/qweather/now.js +++ b/lib/v2/qweather/now.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; const path = require('path'); -const { parseDate } = require('@/utils/parse-date'); -const config = require('@/config').value; +import { parseDate } from '@/utils/parse-date'; +import { config } from '@/config'; const rootUrl = 'https://devapi.qweather.com/v7/weather/now?'; module.exports = async (ctx) => { - const id = await ctx.cache.tryGet(ctx.params.location + '_id', async () => { - const response = await got(`https://geoapi.qweather.com/v2/city/lookup?location=${ctx.params.location}&key=${config.hefeng.key}`); + const id = await ctx.cache.tryGet(ctx.req.param('location') + '_id', async () => { + const response = await got(`https://geoapi.qweather.com/v2/city/lookup?location=${ctx.req.param('location')}&key=${config.hefeng.key}`); const data = []; for (const i in response.data.location) { data.push(response.data.location[i]); @@ -15,7 +15,7 @@ module.exports = async (ctx) => { }); const requestUrl = rootUrl + 'key=' + config.hefeng.key + '&location=' + id; const responseData = await ctx.cache.tryGet( - ctx.params.location + '_now', + ctx.req.param('location') + '_now', async () => { const response = await got(requestUrl); return response.data; @@ -30,16 +30,16 @@ module.exports = async (ctx) => { const time_show = timeObj.toLocaleString(); - ctx.state.data = { - title: ctx.params.location + '实时天气', - description: ctx.params.location + '实时天气状况', + ctx.set('data', { + title: ctx.req.param('location') + '实时天气', + description: ctx.req.param('location') + '实时天气状况', item: data.map((item) => ({ title: '观测时间：' + time_show, description: art(path.join(__dirname, 'templates/now.art'), { item }), pubDate: timeObj, - guid: '位置:' + ctx.params.location + '--时间：' + time_show, + guid: '位置:' + ctx.req.param('location') + '--时间：' + time_show, link: responseData.fxLink, })), link: responseData.fxLink, - }; + }); }; diff --git a/lib/v2/radio-canada/latest.js b/lib/v2/radio-canada/latest.js index c5aa007c99..39ff5b5e1f 100644 --- a/lib/v2/radio-canada/latest.js +++ b/lib/v2/radio-canada/latest.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { load } from 'cheerio'; module.exports = async (ctx) => { - const language = ctx.params.language ?? 'en'; + const language = ctx.req.param('language') ?? 'en'; const rootUrl = 'https://ici.radio-canada.ca'; const apiRootUrl = 'https://services.radio-canada.ca'; @@ -29,7 +29,7 @@ module.exports = async (ctx) => { url: item.link, }); - const $ = cheerio.load(detailResponse.data); + const $ = load(detailResponse.data); const rcState = $('script:contains("window._rcState_ = JSON.parse")') .text() .match(/JSON\.parse\((".*")\);/)[1]; @@ -42,9 +42,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: response.data.meta.title, link: response.data.metric.metrikContent.omniture.url, item: items, - }; + }); }; diff --git a/lib/v2/radio/album.js b/lib/v2/radio/album.js index 456e2e614a..be5984f98c 100644 --- a/lib/v2/radio/album.js +++ b/lib/v2/radio/album.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const CryptoJS = require('crypto-js'); module.exports = async (ctx) => { const KEY = 'f0fc4c668392f9f9a447e48584c214ee'; - const id = ctx.params.id; - const size = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 100; + const id = ctx.req.param('id'); + const size = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 100; const rootUrl = 'https://www.radio.cn'; const apiRootUrl = 'https://ytmsout.radio.cn'; @@ -94,7 +94,7 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: `云听 - ${data.columnName}`, link: currentUrl, item: items, @@ -102,5 +102,5 @@ module.exports = async (ctx) => { itunes_author: data.anchorpersons, description: data.descriptions ?? data.descriptionSimple, itunes_category: data.atypeInfo.map((c) => c.categoryName).join(','), - }; + }); }; diff --git a/lib/v2/radio/index.js b/lib/v2/radio/index.js index 182c4c9eda..f14beb0186 100644 --- a/lib/v2/radio/index.js +++ b/lib/v2/radio/index.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { - const id = ctx.params.id; - const size = ctx.query.limit ?? '100'; + const id = ctx.req.param('id'); + const size = ctx.req.query('limit') ?? '100'; const rootUrl = 'https://www.radio.cn'; const apiRootUrl = 'http://tacc.radio.cn'; @@ -44,12 +44,12 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: `云听 - ${data.odchannel.name}`, link: currentUrl, item: items, image: data.odchannel.imageUrl[0].url, itunes_author: data.odchannel.commissioningEditorName || data.odchannel.editorName || data.odchannel.source || 'radio.cn', description: data.odchannel.description || data.odchannel.sub_title || '', - }; + }); }; diff --git a/lib/v2/radio/zhibo.js b/lib/v2/radio/zhibo.js index 3f52df1ffe..233b4529b7 100644 --- a/lib/v2/radio/zhibo.js +++ b/lib/v2/radio/zhibo.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const CryptoJS = require('crypto-js'); module.exports = async (ctx) => { const KEY = 'f0fc4c668392f9f9a447e48584c214ee'; - const id = ctx.params.id; - const size = ctx.query.limit ?? '100'; + const id = ctx.req.param('id'); + const size = ctx.req.query('limit') ?? '100'; const params = `columnId=${id}&pageNo=0&pageSize=${size}`; @@ -62,12 +62,12 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: `云听 - ${data[0].name}`, link: currentUrl, item: items, image: iconUrl, itunes_author: 'radio.cn', description: data[0].des, - }; + }); }; diff --git a/lib/v2/rarehistoricalphotos/index.js b/lib/v2/rarehistoricalphotos/index.js index c95f91c569..7587a37e95 100644 --- a/lib/v2/rarehistoricalphotos/index.js +++ b/lib/v2/rarehistoricalphotos/index.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const baseUrl = 'https://rarehistoricalphotos.com'; module.exports = async (ctx) => { const { data } = await got(`${baseUrl}/wp-json/wp/v2/posts`, { searchParams: { - per_page: ctx.query.limit ? Number(ctx.query.limit) : undefined, + per_page: ctx.req.query('limit') ? Number(ctx.req.query('limit')) : undefined, }, }); @@ -17,12 +17,12 @@ module.exports = async (ctx) => { pubDate: parseDate(item.date_gmt), })); - ctx.state.data = { + ctx.set('data', { title: 'Rare Historical Photos', description: 'And the story behind them...', link: baseUrl, image: 'https://rarehistoricalphotos.com/wp-content/uploads/2022/04/cropped-rarehistoricalphotos-32x32.png', language: 'en-US', item: items, - }; + }); }; diff --git a/lib/v2/rattibha/user.js b/lib/v2/rattibha/user.js index 124c4a657a..31725908e0 100644 --- a/lib/v2/rattibha/user.js +++ b/lib/v2/rattibha/user.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const baseUrl = 'https://rattibha.com'; @@ -37,9 +37,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `سلاسل تغريدات ${twitterUser}`, link: `${baseUrl}/${twitterUser}`, item: items, - }; + }); }; diff --git a/lib/v2/rawkuma/manga.js b/lib/v2/rawkuma/manga.js index 191af83081..9c8bf55bba 100644 --- a/lib/v2/rawkuma/manga.js +++ b/lib/v2/rawkuma/manga.js @@ -1,19 +1,19 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { const { id } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 50; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 50; const rootUrl = 'https://rawkuma.com'; const currentUrl = new URL(`/manga/${id}`, rootUrl).href; const { data: response } = await got(currentUrl); - const $ = cheerio.load(response); + const $ = load(response); const author = $('div.fmed span').eq(1).text().trim(); const category = $('div.wd-full span.mgen a[rel="tag"]') @@ -42,7 +42,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(item.link, async () => { const { data: detailResponse } = await got(item.link); - const content = cheerio.load(detailResponse); + const content = load(detailResponse); const imageMatches = detailResponse.match(/"images":(\[.*?])}],"lazyload"/); @@ -67,7 +67,7 @@ module.exports = async (ctx) => { .prop('href') .replace(/-\d+x\d+/, ''); - ctx.state.data = { + ctx.set('data', { item: items, title: $('title').text(), link: currentUrl, @@ -77,5 +77,5 @@ module.exports = async (ctx) => { logo: icon, subtitle: $('div.wd-full span').text(), author, - }; + }); }; diff --git a/lib/v2/reactnewsletter/reactnewsletter.js b/lib/v2/reactnewsletter/reactnewsletter.js index 3c20d2f48b..2433949851 100644 --- a/lib/v2/reactnewsletter/reactnewsletter.js +++ b/lib/v2/reactnewsletter/reactnewsletter.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const currentURL = 'https://reactnewsletter.com/issues'; -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const resp = await got(currentURL); - const $ = cheerio.load(resp.data); + const $ = load(resp.data); const text = $('script#__NEXT_DATA__').text(); const json = JSON.parse(text); @@ -16,10 +16,10 @@ module.exports = async (ctx) => { link: `/issues/${item.slug}`, })); - ctx.state.data = { + ctx.set('data', { title: 'reactnewsletter.dev', description: 'Stay up to date on the latest React news, tutorials, resources, and more. Delivered every Tuesday, for free.', link: currentURL, item: items, - }; + }); }; diff --git a/lib/v2/readhub/daily.js b/lib/v2/readhub/daily.js index 9dfbfdb7f3..bbcd53047e 100644 --- a/lib/v2/readhub/daily.js +++ b/lib/v2/readhub/daily.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { rootUrl, processItems } = require('./util'); module.exports = async (ctx) => { - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 11; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 11; const currentUrl = new URL('daily', rootUrl).href; @@ -20,14 +20,14 @@ module.exports = async (ctx) => { items = await processItems(items, ctx.cache.tryGet); - const $ = cheerio.load(currentResponse); + const $ = load(currentResponse); const author = $('meta[name="application-name"]').prop('content'); const subtitle = $('meta[property="og:title"]').prop('content'); const image = 'https://readhub-oss.nocode.com/static/readhub.png'; const icon = new URL($('link[rel="apple-touch-icon"]').prop('href'), rootUrl); - ctx.state.data = { + ctx.set('data', { item: items, title: `${author} - ${subtitle}`, link: currentUrl, @@ -39,5 +39,5 @@ module.exports = async (ctx) => { subtitle, author, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/readhub/index.js b/lib/v2/readhub/index.js index e64428a2f5..a71fe1aaa6 100644 --- a/lib/v2/readhub/index.js +++ b/lib/v2/readhub/index.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const path = require('path'); const { rootUrl, apiTopicUrl, art, processItems } = require('./util'); module.exports = async (ctx) => { const { category = '' } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 30; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 30; const currentUrl = new URL(category ?? '', rootUrl).href; @@ -39,14 +39,14 @@ module.exports = async (ctx) => { items = await processItems(items, ctx.cache.tryGet); - const $ = cheerio.load(currentResponse); + const $ = load(currentResponse); const author = $('meta[property="og:site_name"]').prop('content'); const subtitle = $(`a[data-path="/${category}"]`).text(); const image = $('link[rel="preload"][as="image"]').prop('href'); const icon = $('meta[property="og:image"]').prop('content'); - ctx.state.data = { + ctx.set('data', { item: items, title: `${author} - ${subtitle}`, link: currentUrl, @@ -58,5 +58,5 @@ module.exports = async (ctx) => { subtitle, author, allowEmpty: true, - }; + }); }; diff --git a/lib/v2/readhub/util.js b/lib/v2/readhub/util.js index b6890d4a54..afb35e63d1 100644 --- a/lib/v2/readhub/util.js +++ b/lib/v2/readhub/util.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); const dayjs = require('dayjs'); diff --git a/lib/v2/remnote/changelog.js b/lib/v2/remnote/changelog.js index 9b4c419f48..7090ca5290 100644 --- a/lib/v2/remnote/changelog.js +++ b/lib/v2/remnote/changelog.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; const FQDN = 'feedback.remnote.com'; const apiGateway = 'https://gateway.hellonext.co'; @@ -21,12 +21,12 @@ module.exports = async (ctx) => { pubDate: parseDate(item.published_at.timestamp), })); - ctx.state.data = { + ctx.set('data', { title: 'Changelog | RemNote', description: 'Vote or request new RemNote features. Subscribe to get updates about new features from RemNote.', link: `https://${FQDN}/changelog`, image: 'https://vault.hnxt.dev/uploads/organization_customization/favicon/3970/88153ff13b4b03492ddfee6e675228c1.png', item: items, language: 'en-US', - }; + }); }; diff --git a/lib/v2/researchgate/publications.js b/lib/v2/researchgate/publications.js index 8451f6c672..af2914cf40 100644 --- a/lib/v2/researchgate/publications.js +++ b/lib/v2/researchgate/publications.js @@ -1,12 +1,13 @@ -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import puppeteer from '@/utils/puppeteer'; module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const rootUrl = 'https://www.researchgate.net'; const currentUrl = `${rootUrl}/profile/${id}`; - const browser = await require('@/utils/puppeteer')(); + const browser = puppeteer(); const page = await browser.newPage(); await page.setRequestInterception(true); page.on('request', (request) => { @@ -16,11 +17,11 @@ module.exports = async (ctx) => { const response = await page.evaluate(() => document.documentElement.innerHTML); await page.close(); - const $ = cheerio.load(response); + const $ = load(response); const list = $('div[itemprop="headline"] a') .toArray() - .slice(0, ctx.query.limit ? Number(ctx.query.limit) : 15) + .slice(0, ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 15) .map((item) => { item = $(item); return { @@ -40,7 +41,7 @@ module.exports = async (ctx) => { await page.goto(item.link); const detailResponse = await page.evaluate(() => document.documentElement.innerHTML); await page.close(); - const content = cheerio.load(detailResponse); + const content = load(detailResponse); item.doi = content('meta[property="citation_doi"]').attr('content'); item.pubDate = parseDate(content('meta[property="citation_publication_date"]').attr('content')); @@ -62,9 +63,9 @@ module.exports = async (ctx) => { await browser.close(); - ctx.state.data = { + ctx.set('data', { title: `${$('meta[property="profile:username"]').attr('content')}'s Publications - ResearchGate`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/reuters/common.js b/lib/v2/reuters/common.js index 5fa03002bc..c4a0641f0d 100644 --- a/lib/v2/reuters/common.js +++ b/lib/v2/reuters/common.js @@ -1,17 +1,17 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { const MUST_FETCH_BY_TOPICS = new Set(['authors']); const CAN_USE_SOPHI = ['world']; - const category = ctx.params.category; - const topic = ctx.params.topic ?? (category === 'authors' ? 'reuters' : ''); - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 20; - const useSophi = ctx.query.sophi === 'true' && 'topic' !== '' && CAN_USE_SOPHI.includes(category); + const category = ctx.req.param('category'); + const topic = ctx.req.param('topic') ?? (category === 'authors' ? 'reuters' : ''); + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 20; + const useSophi = ctx.req.query('sophi') === 'true' && 'topic' !== '' && CAN_USE_SOPHI.includes(category); const section_id = `/${category}/${topic ? `${topic}/` : ''}`; const { title, description, rootUrl, response } = await (async () => { @@ -77,10 +77,10 @@ module.exports = async (ctx) => { const results = await Promise.allSettled( items.map((item) => - ctx.query.mode === 'fulltext' + ctx.req.query('mode') === 'fulltext' ? ctx.cache.tryGet(item.link, async () => { const detailResponse = await got(item.link); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); if (detailResponse.url.startsWith('https://www.reuters.com/investigates/')) { const ldJson = JSON.parse(content('script[type="application/ld+json"]').text()); @@ -131,11 +131,11 @@ module.exports = async (ctx) => { ); items = results.filter((r) => r.status === 'fulfilled').map((r) => r.value); - ctx.state.data = { + ctx.set('data', { title, description, image: 'https://www.reuters.com/pf/resources/images/reuters/logo-vertical-default-512x512.png?d=116', link: `https://www.reuters.com${section_id}`, item: items, - }; + }); }; diff --git a/lib/v2/reuters/investigates.js b/lib/v2/reuters/investigates.js index f61016eb8d..2c337bb2f4 100644 --- a/lib/v2/reuters/investigates.js +++ b/lib/v2/reuters/investigates.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const rootUrl = 'https://www.reuters.com'; const currentUrl = `${rootUrl}/investigates/`; const response = await got(currentUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('article.section-article-container.row') .map((_, item) => ({ @@ -19,7 +19,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const detailResponse = await got(item.link); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.title = content('title').text(); item.description = content('article.special-report').html(); @@ -31,9 +31,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('h1.series-subtitle').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/rfa/index.js b/lib/v2/rfa/index.js index e73e200d49..9f94cee2f3 100644 --- a/lib/v2/rfa/index.js +++ b/lib/v2/rfa/index.js @@ -1,19 +1,19 @@ -const cheerio = require('cheerio'); -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import { load } from 'cheerio'; +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - let url = 'https://www.rfa.org/' + (ctx.params.language ?? 'english'); + let url = 'https://www.rfa.org/' + (ctx.req.param('language') ?? 'english'); - if (ctx.params.channel) { - url += '/' + ctx.params.channel; + if (ctx.req.param('channel')) { + url += '/' + ctx.req.param('channel'); } - if (ctx.params.subChannel) { - url += '/' + ctx.params.subChannel; + if (ctx.req.param('subChannel')) { + url += '/' + ctx.req.param('subChannel'); } const response = await got(url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const selectors = ['div[id=topstorywidefull]', 'div.two_featured', 'div.three_featured', 'div.single_column_teaser', 'div.sectionteaser', 'div.specialwrap']; const list = []; @@ -31,7 +31,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(item.link, async () => { const content = await got(item.link); - const description = cheerio.load(content.data); + const description = load(content.data); item.description = description('#headerimg').html() + description('div[id=storytext]').html(); item.pubDate = parseDate(description('span[id=story_date]').text()); if (description('meta[property=og:audio]').attr('content') !== undefined) { @@ -43,9 +43,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'RFA', link: 'https://www.rfa.org/', item: result, - }; + }); }; diff --git a/lib/v2/rfi/news.js b/lib/v2/rfi/news.js index ceed07565b..698bcd0d15 100644 --- a/lib/v2/rfi/news.js +++ b/lib/v2/rfi/news.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const rootUrl = 'https://www.rfi.fr/'; - const path = ctx.params.path ?? 'en'; + const path = ctx.req.param('path') ?? 'en'; const currentUrl = `${rootUrl}${path.endsWith('/') ? path : `${path}/`}`; const response = await got(currentUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); $('aside[data-org-type="aside-content--highlighted"], aside[data-org-type="aside-content--sponsors"]').remove(); @@ -27,7 +27,7 @@ module.exports = async (ctx) => { items.map((item) => ctx.cache.tryGet(item.link, async () => { const detailResponse = await got(item.link); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); content('.m-interstitial, .m-em-quote svg, .o-self-promo').remove(); @@ -56,7 +56,7 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), description: $('meta[name="description"]').attr('content'), link: currentUrl, @@ -65,5 +65,5 @@ module.exports = async (ctx) => { logo: new URL($('link[rel="apple-touch-icon"]').attr('href'), currentUrl).href, item: items, language: $('html').attr('lang'), - }; + }); }; diff --git a/lib/v2/right/forum.js b/lib/v2/right/forum.js index 94f2383ffe..e7a9d252f9 100644 --- a/lib/v2/right/forum.js +++ b/lib/v2/right/forum.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const id = ctx.params.id ?? '31'; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 20; + const id = ctx.req.param('id') ?? '31'; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 20; const rootUrl = 'https://www.right.com.cn'; const currentUrl = `${rootUrl}/forum/forum-${id}-1.html`; @@ -15,7 +15,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); $('a[title="隐藏置顶帖"]').each(function () { $(this).parents('tbody').remove(); @@ -41,7 +41,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); content('.pstatus').remove(); @@ -57,9 +57,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${$('.xs2 a').text()} - 恩山无线论坛`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/rodong/news.js b/lib/v2/rodong/news.js index 4ac45959ae..7aac6c2e0a 100644 --- a/lib/v2/rodong/news.js +++ b/lib/v2/rodong/news.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const host = 'http://www.rodong.rep.kp'; @@ -9,7 +9,7 @@ module.exports = async (ctx) => { const link = `${host}/${language}/index.php?MkBAMkAxQA==`; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const list = $('.date_news_list .row') .toArray() .map((item) => { @@ -26,7 +26,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const { data: response } = await got(item.link); - const $ = cheerio.load(response); + const $ = load(response); $('.news_Title, .NewsDetail, .News_Detail, #moveNews').remove(); item.description = $('.col-sm-8').html(); @@ -36,10 +36,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), description: $('head meta[name="description"]').attr('content'), link, item: items, - }; + }); }; diff --git a/lib/v2/routledge/book-series.js b/lib/v2/routledge/book-series.js index 0ad430541b..1be90d983c 100644 --- a/lib/v2/routledge/book-series.js +++ b/lib/v2/routledge/book-series.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { @@ -21,7 +21,7 @@ module.exports = async (ctx) => { view: 'list', }, }); - const $ = cheerio.load(response); + const $ = load(response); const list = $('.row.book') .toArray() @@ -46,7 +46,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const { data } = await got(item.link); - const $ = cheerio.load(data); + const $ = load(data); const isbn = $('meta[property="books:isbn"]').attr('content'); const { data: image } = await got('https://productimages.routledge.com', { searchParams: { @@ -69,10 +69,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), description: $('head meta[name="description"]').attr('content'), link: pageUrl, item: items, - }; + }); }; diff --git a/lib/v2/rsc/journal.js b/lib/v2/rsc/journal.js index 5943bc79a6..6ba36a32cc 100644 --- a/lib/v2/rsc/journal.js +++ b/lib/v2/rsc/journal.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { const { id, category = 'allrecentarticles' } = ctx.params; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 50; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 50; const rootUrl = 'https://pubs.rsc.org'; const currentUrl = new URL(`en/journals/journalissues/${id}#!recentarticles`, rootUrl).href; @@ -22,7 +22,7 @@ module.exports = async (ctx) => { }, }); - let $ = cheerio.load(response); + let $ = load(response); $('div.capsule__article-image').each(function () { $(this).replaceWith( @@ -66,7 +66,7 @@ module.exports = async (ctx) => { if (item.category.pop()) { const { data: detailResponse } = await got(item.link.replace(/\/articlelanding\//, '/articlehtml/')); - const content = cheerio.load(detailResponse); + const content = load(detailResponse); content('#pnlArticleAccess, #pnlArticleContent').remove(); content('div.abstract, div.article-abstract__heading').prevAll().remove(); @@ -86,11 +86,11 @@ module.exports = async (ctx) => { const { data: detailResponse } = await got(currentUrl); - $ = cheerio.load(detailResponse); + $ = load(detailResponse); const icon = new URL($('link[rel="apple-touch-icon"]').prop('href'), rootUrl).href; - ctx.state.data = { + ctx.set('data', { item: items, title: $('meta[name="citation_title"]').prop('content'), link: currentUrl, @@ -102,5 +102,5 @@ module.exports = async (ctx) => { subtitle: $('title').text(), author: $('meta[name="citation_journal_abbrev"]').prop('content'), allowEmpty: true, - }; + }); }; diff --git a/lib/v2/rsshub/routes.js b/lib/v2/rsshub/routes.js index 4e1e6389bd..6cff1e5483 100644 --- a/lib/v2/rsshub/routes.js +++ b/lib/v2/rsshub/routes.js @@ -1,8 +1,8 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; module.exports = async (ctx) => { - const isEnglish = ctx.params.lang !== 'zh'; + const isEnglish = ctx.req.param('lang') !== 'zh'; const lang = isEnglish ? '' : 'zh/'; const types = [ @@ -36,7 +36,7 @@ module.exports = async (ctx) => { const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const page = $('.page').toArray(); const item = $('.routeBlock').toArray(); return { page, item, type }; @@ -44,13 +44,13 @@ module.exports = async (ctx) => { ); const list = all.flatMap(({ page, item, type }) => item.map((item) => ({ page, item, type }))); - ctx.state.data = { + ctx.set('data', { title: isEnglish ? 'RSSHub has new routes' : 'RSSHub 有新路由啦', link: 'https://docs.rsshub.app', description: isEnglish ? 'Everything is RSSible' : '万物皆可 RSS', language: isEnglish ? 'en-us' : 'zh-cn', item: list.map(({ page, item, type }) => { - const $ = cheerio.load(page); + const $ = load(page); item = $(item); const h2Title = item.prevAll('h2').eq(0); const h3Title = item.prevAll('h3').eq(0); @@ -61,5 +61,5 @@ module.exports = async (ctx) => { guid: item.attr('id'), }; }), - }; + }); }; diff --git a/lib/v2/rsshub/transform/html.js b/lib/v2/rsshub/transform/html.js index 5f12adbd7c..93a94345de 100644 --- a/lib/v2/rsshub/transform/html.js +++ b/lib/v2/rsshub/transform/html.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const config = require('@/config').value; +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { config } from '@/config'; module.exports = async (ctx) => { if (!config.feature.allow_user_supply_unsafe_domain) { - ctx.throw(403, `This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`); + throw new Error(`This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`); } const { url } = ctx.params; const response = await got({ @@ -12,8 +12,8 @@ module.exports = async (ctx) => { url, }); - const routeParams = new URLSearchParams(ctx.params.routeParams); - const $ = cheerio.load(response.data); + const routeParams = new URLSearchParams(ctx.req.param('routeParams')); + const $ = load(response.data); const rssTitle = routeParams.get('title') || $('title').text(); const item = routeParams.get('item') || 'html'; const items = $(item) @@ -56,10 +56,10 @@ module.exports = async (ctx) => { }) .filter(Boolean); - ctx.state.data = { + ctx.set('data', { title: rssTitle, link: url, description: `Proxy ${url}`, item: items, - }; + }); }; diff --git a/lib/v2/rsshub/transform/json.js b/lib/v2/rsshub/transform/json.js index 9c183c9509..ff567eb1fc 100644 --- a/lib/v2/rsshub/transform/json.js +++ b/lib/v2/rsshub/transform/json.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const config = require('@/config').value; +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { config } from '@/config'; function jsonGet(obj, attr) { if (typeof attr !== 'string') { @@ -16,7 +16,7 @@ function jsonGet(obj, attr) { module.exports = async (ctx) => { if (!config.feature.allow_user_supply_unsafe_domain) { - ctx.throw(403, `This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`); + throw new Error(`This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`); } const { url } = ctx.params; const response = await got({ @@ -24,14 +24,14 @@ module.exports = async (ctx) => { url, }); - const routeParams = new URLSearchParams(ctx.params.routeParams); + const routeParams = new URLSearchParams(ctx.req.param('routeParams')); let rssTitle = routeParams.get('title'); if (!rssTitle) { const resp = await got({ method: 'get', url: new URL(url).origin, }); - const $ = cheerio.load(resp.data); + const $ = load(resp.data); rssTitle = $('title').text(); } @@ -49,10 +49,10 @@ module.exports = async (ctx) => { }; }); - ctx.state.data = { + ctx.set('data', { title: rssTitle, link: url, description: `Proxy ${url}`, item: items, - }; + }); }; diff --git a/lib/v2/rsshub/transform/sitemap.js b/lib/v2/rsshub/transform/sitemap.js index 18de638f3e..2d901fe589 100644 --- a/lib/v2/rsshub/transform/sitemap.js +++ b/lib/v2/rsshub/transform/sitemap.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const config = require('@/config').value; +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { config } from '@/config'; module.exports = async (ctx) => { if (!config.feature.allow_user_supply_unsafe_domain) { - ctx.throw(403, `This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`); + throw new Error(`This RSS is disabled unless 'ALLOW_USER_SUPPLY_UNSAFE_DOMAIN' is set to 'true'.`); } const { url } = ctx.params; const response = await got({ @@ -12,8 +12,8 @@ module.exports = async (ctx) => { url, }); - const routeParams = new URLSearchParams(ctx.params.routeParams); - const $ = cheerio.load(response.data, { xmlMode: true }); + const routeParams = new URLSearchParams(ctx.req.param('routeParams')); + const $ = load(response.data, { xmlMode: true }); const rssTitle = routeParams.get('title') || ($('urlset url').length && $('urlset url').first().find('loc').text() ? $('urlset url').first().find('loc').text() : 'Sitemap'); @@ -41,10 +41,10 @@ module.exports = async (ctx) => { .filter(Boolean) : []; - ctx.state.data = { + ctx.set('data', { title: rssTitle, link: url, description: `Proxy ${url}`, item: items, - }; + }); }; diff --git a/lib/v2/ruancan/category.js b/lib/v2/ruancan/category.js index a2a7edbeef..3239d9a094 100644 --- a/lib/v2/ruancan/category.js +++ b/lib/v2/ruancan/category.js @@ -1,7 +1,7 @@ const fetchFeed = require('./utils'); module.exports = async (ctx) => { - const category = ctx.params.category; + const category = ctx.req.param('category'); const currentUrl = `/cat/${category}`; ctx.state.data = await fetchFeed(ctx, currentUrl); diff --git a/lib/v2/ruancan/search.js b/lib/v2/ruancan/search.js index ec3d7ff586..df17fd81c6 100644 --- a/lib/v2/ruancan/search.js +++ b/lib/v2/ruancan/search.js @@ -1,7 +1,7 @@ const fetchFeed = require('./utils'); module.exports = async (ctx) => { - const keyword = ctx.params.keyword; + const keyword = ctx.req.param('keyword'); const currentUrl = `/?s=${keyword}`; ctx.state.data = await fetchFeed(ctx, currentUrl); diff --git a/lib/v2/ruancan/user.js b/lib/v2/ruancan/user.js index 3117e0ee0f..4ea2ed6572 100644 --- a/lib/v2/ruancan/user.js +++ b/lib/v2/ruancan/user.js @@ -1,7 +1,7 @@ const fetchFeed = require('./utils'); module.exports = async (ctx) => { - const id = ctx.params.id; + const id = ctx.req.param('id'); const currentUrl = `/i/${id}`; ctx.state.data = await fetchFeed(ctx, currentUrl); diff --git a/lib/v2/ruancan/utils.js b/lib/v2/ruancan/utils.js index 4bc21001d2..b3b475b048 100644 --- a/lib/v2/ruancan/utils.js +++ b/lib/v2/ruancan/utils.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx, currentUrl) => { const rootUrl = 'https://www.ruancan.com'; @@ -11,10 +11,10 @@ module.exports = async (ctx, currentUrl) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.item-title a') - .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 15) + .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 15) .toArray() .map((item) => { item = $(item); @@ -33,7 +33,7 @@ module.exports = async (ctx, currentUrl) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); content('.entry-copyright').remove(); diff --git a/lib/v2/ruc/hr.js b/lib/v2/ruc/hr.js index 4dc05b387c..b2565e9b0e 100644 --- a/lib/v2/ruc/hr.js +++ b/lib/v2/ruc/hr.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const category = ctx.params.category?.replace(/-/g, '/') ?? 'tzgg'; + const category = ctx.req.param('category')?.replace(/-/g, '/') ?? 'tzgg'; const rootUrl = 'http://hr.ruc.edu.cn'; const currentUrl = `${rootUrl}/${category}/index.htm`; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('a[title]') .toArray() @@ -37,7 +37,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('.neirong').html(); item.pubDate = parseDate(detailResponse.data.match(/日期：(\d{4}-\d{2}-\d{2})/)[1]); @@ -50,9 +50,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/runtrail/posts.js b/lib/v2/runtrail/posts.js index 0ed141ec54..eb558dca1c 100644 --- a/lib/v2/runtrail/posts.js +++ b/lib/v2/runtrail/posts.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const baseUrl = 'https://runtrail.cn'; const { data: response } = await got(`${baseUrl}/wp-json/wp/v2/posts`, { searchParams: { _embed: true, - per_page: ctx.query.limit ? Number.parseInt(ctx.query.limit) : 30, + per_page: ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 30, }, }); @@ -26,9 +26,9 @@ module.exports = async (ctx) => { link: item.link, })); - ctx.state.data = { + ctx.set('data', { title: '最新文章 - 跑野大爆炸', link: baseUrl, item: items, - }; + }); }; diff --git a/lib/v2/rustcc/jobs.js b/lib/v2/rustcc/jobs.js index e7f785fc39..607453aa1e 100644 --- a/lib/v2/rustcc/jobs.js +++ b/lib/v2/rustcc/jobs.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const base_url = 'https://rustcc.cn'; @@ -15,19 +15,19 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.article-list li').get(); - ctx.state.data = { + ctx.set('data', { title: 'Rust语言中文社区 | 招聘', link: jobs_url, description: `获取Rust语言中文社区的最新招聘`, item: await Promise.all(list.map((item) => getFeedItem(item))), - }; + }); }; function getFeedItem(item) { - const $ = cheerio.load(item); + const $ = load(item); const title = $('.title'); return { diff --git a/lib/v2/sakurazaka46/blog.js b/lib/v2/sakurazaka46/blog.js index a8ee1b7119..42a5a5deab 100644 --- a/lib/v2/sakurazaka46/blog.js +++ b/lib/v2/sakurazaka46/blog.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const id = ctx.params.id ?? 'all'; - const page = ctx.params.page ?? '0'; + const id = ctx.req.param('id') ?? 'all'; + const page = ctx.req.param('page') ?? '0'; const rootUrl = 'https://sakurazaka46.com'; const params = id === 'all' ? `?page=${page}` : `?page=${page}&ct=${id}`; @@ -16,7 +16,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.com-blog-part .box a') .toArray() @@ -38,7 +38,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('.box-article').html(); item.pubDate = timezone(parseDate(content('.blog-foot .date').text()), +9); @@ -48,9 +48,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `${$('title').text()}${id ? ` - ${$('.name').first().text()}` : ''}`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/sakurazaka46/news.js b/lib/v2/sakurazaka46/news.js index 04edf4c1e7..6934da0e42 100644 --- a/lib/v2/sakurazaka46/news.js +++ b/lib/v2/sakurazaka46/news.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const rootUrl = 'https://sakurazaka46.com'; @@ -11,10 +11,10 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.com-news-part .box a') - .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 30) + .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 30) .toArray() .map((item) => { item = $(item); @@ -34,7 +34,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('.article').html(); @@ -43,9 +43,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/samsung/research/blog.js b/lib/v2/samsung/research/blog.js index ab5c47f400..3d5237547b 100644 --- a/lib/v2/samsung/research/blog.js +++ b/lib/v2/samsung/research/blog.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const rootUrl = 'https://research.samsung.com'; @@ -32,7 +32,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('.news-con').html(); @@ -41,9 +41,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'BLOG | Samsung Research', link: `${rootUrl}/blog`, item: items, - }; + }); }; diff --git a/lib/v2/saraba1st/digest.js b/lib/v2/saraba1st/digest.js index 89ee1182b1..628da33c3c 100644 --- a/lib/v2/saraba1st/digest.js +++ b/lib/v2/saraba1st/digest.js @@ -1,24 +1,24 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const config = require('@/config').value; -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { config } from '@/config'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { - const tid = ctx.params.tid; + const tid = ctx.req.param('tid'); const cookieString = config.saraba1st.cookie ?? ''; const res = await got('https://bbs.saraba1st.com/2b/' + tid + '.html', { headers: { Cookie: cookieString, }, }); - const $ = cheerio.load(res.data); + const $ = load(res.data); const title = $('head title').text().replace(/-.*/, ''); const list = $('#threadlisttableid tbody[id^="normalthread_"] tr'); const count = list - .slice(0, ctx.query.limit ? Number(ctx.query.limit) : 20) + .slice(0, ctx.req.query('limit') ? Number(ctx.req.query('limit')) : 20) .toArray() .map((each) => { each = $(each); @@ -41,12 +41,12 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `Stage1 论坛 - ${title}`, link: `https://bbs.saraba1st.com/2b/${tid}.html`, // item: await resultItems, item: resultItems, - }; + }); }; async function fetchContent(url) { @@ -57,7 +57,7 @@ async function fetchContent(url) { Cookie: cookieString, }, }); - const subind = cheerio.load(subres.data); + const subind = load(subres.data); const stubS = subind('');
subind('#postlist')
.find('div[id*="post_"] ')
diff --git a/lib/v2/saraba1st/thread.js b/lib/v2/saraba1st/thread.js
index aea4c8261e..a74ca52bc3 100644
--- a/lib/v2/saraba1st/thread.js
+++ b/lib/v2/saraba1st/thread.js
@@ -1,12 +1,12 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
const queryString = require('query-string');
-const config = require('@/config').value;
-const { parseDate } = require('@/utils/parse-date');
-const timezone = require('@/utils/timezone');
+import { config } from '@/config';
+import { parseDate } from '@/utils/parse-date';
+import timezone from '@/utils/timezone';
module.exports = async (ctx) => {
- const tid = ctx.params.tid;
+ const tid = ctx.req.param('tid');
const cookieString = config.saraba1st.cookie ?? '';
const res = await got('https://bbs.saraba1st.com/2b/forum.php', {
@@ -20,7 +20,7 @@ module.exports = async (ctx) => {
},
});
- const $ = cheerio.load(res.data);
+ const $ = load(res.data);
const title = $('#thread_subject').text();
const list = $('#postlist > div[id^=post_]:not(:first-of-type)');
@@ -55,9 +55,9 @@ module.exports = async (ctx) => {
};
});
- ctx.state.data = {
+ ctx.set('data', {
title: `Stage1 论坛 - ${title}`,
link: `https://bbs.saraba1st.com/2b/thread-${tid}-1-1.html`,
item: resultItems,
- };
+ });
};
diff --git a/lib/v2/sass/gs/index.js b/lib/v2/sass/gs/index.js
index f74406b004..dbb4a7342c 100644
--- a/lib/v2/sass/gs/index.js
+++ b/lib/v2/sass/gs/index.js
@@ -1,15 +1,15 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
const host = 'https://gs.sass.org.cn';
module.exports = async (ctx) => {
- const type = ctx.params.type;
+ const type = ctx.req.param('type');
const url = `${host}/${type}/list.htm`;
const response = await got(url);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('.column-news-list .cols_list .cols');
const items = await Promise.all(
list.map((i, item) => {
@@ -22,7 +22,7 @@ module.exports = async (ctx) => {
let description = '';
if (itemUrl) {
const result = await got(itemUrl);
- const $ = cheerio.load(result.data);
+ const $ = load(result.data);
description = $('.read .wp_articlecontent').length ? $('.read .wp_articlecontent').html().trim() : itemTitle;
} else {
description = itemTitle;
@@ -37,10 +37,10 @@ module.exports = async (ctx) => {
})
);
// 处理返回
- ctx.state.data = {
+ ctx.set('data', {
title: '上海社会科学院 - 研究生院',
link: url,
description: '上海社会科学院 - 研究生院',
item: items,
- };
+ });
};
diff --git a/lib/v2/scau/yjs.js b/lib/v2/scau/yjs.js
index 343cd4b09a..539aeff910 100644
--- a/lib/v2/scau/yjs.js
+++ b/lib/v2/scau/yjs.js
@@ -1,14 +1,14 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const link = 'https://yzb.scau.edu.cn/2136/list1.htm';
const response = await got(link);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('#wp_news_w25 tr');
- ctx.state.data = {
+ ctx.set('data', {
title: '华南农业大学研招办',
link,
description: '华农研讯',
@@ -23,5 +23,5 @@ module.exports = async (ctx) => {
pubDate: parseDate(item.find('td').eq(3).text(), 'YYYY/MM/DD'),
};
}),
- };
+ });
};
diff --git a/lib/v2/scau/yjsy.js b/lib/v2/scau/yjsy.js
index 1e0259a2e9..95742e0822 100644
--- a/lib/v2/scau/yjsy.js
+++ b/lib/v2/scau/yjsy.js
@@ -1,14 +1,14 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const link = 'https://yjsy.scau.edu.cn/208/list1.htm';
const response = await got(link);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('#wp_news_w25 tr td tr');
- ctx.state.data = {
+ ctx.set('data', {
title: '华南农业大学研究生院',
link,
description: '通知公告',
@@ -23,5 +23,5 @@ module.exports = async (ctx) => {
pubDate: parseDate(item.find('td').eq(2).text(), 'YYYY/MM/DD'),
};
}),
- };
+ });
};
diff --git a/lib/v2/science/blogs.js b/lib/v2/science/blogs.js
index a5f5287b2f..10aad2587b 100644
--- a/lib/v2/science/blogs.js
+++ b/lib/v2/science/blogs.js
@@ -1,7 +1,8 @@
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
const { baseUrl } = require('./utils');
-const config = require('@/config').value;
+import { config } from '@/config';
+import puppeteer from '@/utils/puppeteer';
module.exports = async (ctx) => {
const { name = 'pipeline' } = ctx.params;
@@ -10,7 +11,7 @@ module.exports = async (ctx) => {
const response = await ctx.cache.tryGet(
link,
async () => {
- const browser = await require('@/utils/puppeteer')();
+ const browser = puppeteer();
const page = await browser.newPage();
await page.setRequestInterception(true);
@@ -32,7 +33,7 @@ module.exports = async (ctx) => {
false
);
- const $ = cheerio.load(response, { xmlMode: true });
+ const $ = load(response, { xmlMode: true });
const items = $('item')
.toArray()
.map((item) => {
@@ -51,12 +52,12 @@ module.exports = async (ctx) => {
const name_re = /Keyword search result for Blog Series: (?[^-]+) --/;
const { blog_name = 'Unknown Title' } = $('channel > description').text().match(name_re).groups;
- ctx.state.data = {
+ ctx.set('data', {
title: `Science Blogs: ${blog_name}`,
description: `A Science.org blog called ${blog_name}`,
image: `${baseUrl}/apple-touch-icon.png`,
link: `${baseUrl}/blogs/${name}`,
language: 'en-US',
item: items,
- };
+ });
};
diff --git a/lib/v2/science/cover.js b/lib/v2/science/cover.js
index afc33e22fa..c9f67867f7 100644
--- a/lib/v2/science/cover.js
+++ b/lib/v2/science/cover.js
@@ -7,10 +7,10 @@
// signaling: Science Signaling
// stm: Science Translational Medicine
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
const { baseUrl } = require('./utils');
@@ -22,7 +22,7 @@ module.exports = async (ctx) => {
cookie: 'cookiePolicy=iaccept;',
},
});
- const $ = cheerio.load(pageResponse);
+ const $ = load(pageResponse);
const items = $('.browse-journals .browse-journals__item')
.not('.partner-journals')
@@ -58,12 +58,12 @@ module.exports = async (ctx) => {
};
});
- ctx.state.data = {
+ ctx.set('data', {
title: $('head title').text(),
description: $('meta[property="og:description"]').attr('content'),
image: `${baseUrl}/apple-touch-icon.png`,
link: pageURL,
language: 'en-US',
item: items,
- };
+ });
};
diff --git a/lib/v2/science/current.js b/lib/v2/science/current.js
index 4cd039f369..05bf8bba60 100644
--- a/lib/v2/science/current.js
+++ b/lib/v2/science/current.js
@@ -7,9 +7,10 @@
// signaling: Science Signaling
// stm: Science Translational Medicine
-const cheerio = require('cheerio');
-const got = require('@/utils/got');
+import { load } from 'cheerio';
+import got from '@/utils/got';
const { baseUrl, fetchDesc, getItem } = require('./utils');
+import puppeteer from '@/utils/puppeteer';
module.exports = async (ctx) => {
const { journal = 'science' } = ctx.params;
@@ -20,23 +21,23 @@ module.exports = async (ctx) => {
cookie: 'cookiePolicy=iaccept;',
},
});
- const $ = cheerio.load(pageResponse);
+ const $ = load(pageResponse);
const pageTitleName = $('head > title').text();
const list = $('.toc__section .card')
.toArray()
.map((item) => getItem(item, $));
- const browser = await require('@/utils/puppeteer')();
+ const browser = puppeteer();
const items = await fetchDesc(list, browser, ctx.cache.tryGet);
await browser.close();
- ctx.state.data = {
+ ctx.set('data', {
title: `${pageTitleName} | Current Issue`,
description: `Current Issue of ${pageTitleName}`,
image: `${baseUrl}/apple-touch-icon.png`,
link: pageURL,
language: 'en-US',
item: items,
- };
+ });
};
diff --git a/lib/v2/science/early.js b/lib/v2/science/early.js
index 8a031c26eb..fa48373548 100644
--- a/lib/v2/science/early.js
+++ b/lib/v2/science/early.js
@@ -1,5 +1,6 @@
-const cheerio = require('cheerio');
-const got = require('@/utils/got');
+import { load } from 'cheerio';
+import got from '@/utils/got';
+import puppeteer from '@/utils/puppeteer';
const { baseUrl, fetchDesc, getItem } = require('./utils');
@@ -12,22 +13,22 @@ module.exports = async (ctx) => {
cookie: 'cookiePolicy=iaccept;',
},
});
- const $ = cheerio.load(res);
+ const $ = load(res);
const list = $('.card-content .card-header')
.toArray()
.map((item) => getItem(item, $));
- const browser = await require('@/utils/puppeteer')();
+ const browser = puppeteer();
const items = await fetchDesc(list, browser, ctx.cache.tryGet);
await browser.close();
- ctx.state.data = {
+ ctx.set('data', {
title: $('head title').text(),
description: $('.body02').text().trim(),
image: `${baseUrl}/apple-touch-icon.png`,
link: pageUrl,
language: 'en-US',
item: items,
- };
+ });
};
diff --git a/lib/v2/science/utils.js b/lib/v2/science/utils.js
index 42a4f3fc1d..620d4f4b08 100644
--- a/lib/v2/science/utils.js
+++ b/lib/v2/science/utils.js
@@ -1,7 +1,7 @@
-const cheerio = require('cheerio');
-const { art } = require('@/utils/render');
+import { load } from 'cheerio';
+import { art } from '@/utils/render';
const path = require('path');
-const { parseDate } = require('@/utils/parse-date');
+import { parseDate } from '@/utils/parse-date';
const baseUrl = 'https://www.science.org';
@@ -22,7 +22,7 @@ const fetchDesc = (list, browser, tryGet) =>
const res = await page.evaluate(() => document.documentElement.innerHTML);
await page.close();
- const $ = cheerio.load(res);
+ const $ = load(res);
const abstract = $('div#abstracts').html();
const content = $('.news-article-content--featured').length
? $('.news-article-content--featured').html()
diff --git a/lib/v2/sciencedirect/journal.js b/lib/v2/sciencedirect/journal.js
index 22b9fd1589..1578cfe243 100644
--- a/lib/v2/sciencedirect/journal.js
+++ b/lib/v2/sciencedirect/journal.js
@@ -1,10 +1,10 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
const { decodeCFEmail } = require('./cf-email');
module.exports = async (ctx) => {
- const id = ctx.params.id;
+ const id = ctx.req.param('id');
const rootUrl = 'https://www.sciencedirect.com';
const currentUrl = `${rootUrl}/journal/${id}/articles-in-press`;
@@ -43,7 +43,7 @@ module.exports = async (ctx) => {
url: item.link,
});
- const content = cheerio.load(detailResponse.data);
+ const content = load(detailResponse.data);
content('a.__cf_email__').each((_, e) => {
e = content(e);
@@ -61,9 +61,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: `${response.data.match(/\\"displayName\\":\\"(.*?)\\",\\"/)[1]} - ScienceDirect`,
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/sciencenet/blog.js b/lib/v2/sciencenet/blog.js
index a08d158335..49e62663ec 100644
--- a/lib/v2/sciencenet/blog.js
+++ b/lib/v2/sciencenet/blog.js
@@ -1,13 +1,13 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
const iconv = require('iconv-lite');
-const timezone = require('@/utils/timezone');
-const { parseDate } = require('@/utils/parse-date');
+import timezone from '@/utils/timezone';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
- const type = ctx.params.type ?? 'recommend';
- const time = ctx.params.time ?? '5';
- const sort = ctx.params.sort ?? '1';
+ const type = ctx.req.param('type') ?? 'recommend';
+ const time = ctx.req.param('time') ?? '5';
+ const sort = ctx.req.param('sort') ?? '1';
const rootUrl = 'http://blog.sciencenet.cn';
const currentUrl = `${rootUrl}/blog.php?mod=${type}&type=list&op=${time}&ord=${sort}`;
@@ -18,10 +18,10 @@ module.exports = async (ctx) => {
responseType: 'buffer',
});
- const $ = cheerio.load(iconv.decode(response.data, 'gbk'));
+ const $ = load(iconv.decode(response.data, 'gbk'));
let items = $('tr td a[title]')
- .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 50)
+ .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 50)
.toArray()
.map((item) => {
item = $(item);
@@ -42,7 +42,7 @@ module.exports = async (ctx) => {
responseType: 'buffer',
});
- const content = cheerio.load(iconv.decode(detailResponse.data, 'gbk'));
+ const content = load(iconv.decode(detailResponse.data, 'gbk'));
item.author = content('.xs2').text();
item.description = content('#blog_article').html();
@@ -53,9 +53,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: '科学网 - 精选博文',
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/sciencenet/user.js b/lib/v2/sciencenet/user.js
index 07749e3e77..9b3cb99b96 100644
--- a/lib/v2/sciencenet/user.js
+++ b/lib/v2/sciencenet/user.js
@@ -1,11 +1,11 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
const iconv = require('iconv-lite');
-const timezone = require('@/utils/timezone');
-const { parseDate } = require('@/utils/parse-date');
+import timezone from '@/utils/timezone';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
- const id = ctx.params.id;
+ const id = ctx.req.param('id');
const rootUrl = 'https://blog.sciencenet.cn';
const currentUrl = `${rootUrl}/u/${id}`;
@@ -16,17 +16,17 @@ module.exports = async (ctx) => {
responseType: 'buffer',
});
- let $ = cheerio.load(iconv.decode(response.data, 'gbk'));
+ let $ = load(iconv.decode(response.data, 'gbk'));
response = await got({
method: 'get',
url: $('.xg1 a').eq(1).attr('href'),
});
- $ = cheerio.load(response.data);
+ $ = load(response.data);
let items = $('item')
- .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 50)
+ .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 50)
.toArray()
.map((item) => {
item = $(item);
@@ -46,7 +46,7 @@ module.exports = async (ctx) => {
responseType: 'buffer',
});
- const content = cheerio.load(iconv.decode(detailResponse.data, 'gbk'));
+ const content = load(iconv.decode(detailResponse.data, 'gbk'));
item.author = content('.xs2').text();
item.description = content('#blog_article').html();
@@ -57,9 +57,9 @@ module.exports = async (ctx) => {
)
);
- ctx.state.data = {
+ ctx.set('data', {
title: `科学网 - ${items[0].author}的博文`,
link: currentUrl,
item: items,
- };
+ });
};
diff --git a/lib/v2/scmp/index.js b/lib/v2/scmp/index.js
index 362408f5c4..185c783415 100644
--- a/lib/v2/scmp/index.js
+++ b/lib/v2/scmp/index.js
@@ -1,13 +1,13 @@
-const cheerio = require('cheerio');
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
+import { load } from 'cheerio';
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
const { parseItem } = require('./utils');
module.exports = async (ctx) => {
- const categoryId = ctx.params.category_id;
+ const categoryId = ctx.req.param('category_id');
const rssUrl = `https://www.scmp.com/rss/${categoryId}/feed`;
const { data: response } = await got(rssUrl);
- const $ = cheerio.load(response, {
+ const $ = load(response, {
xmlMode: true,
});
@@ -44,11 +44,11 @@ module.exports = async (ctx) => {
const items = await Promise.all(list.map((item) => ctx.cache.tryGet(item.link, () => parseItem)));
- ctx.state.json = {
+ ctx.set('json', {
items,
- };
+ });
- ctx.state.data = {
+ ctx.set('data', {
title: $('channel > title').text(),
link: $('channel > link').text(),
description: $('channel > description').text(),
@@ -57,5 +57,5 @@ module.exports = async (ctx) => {
icon: 'https://assets.i-scmp.com/static/img/icons/scmp-icon-256x256.png',
logo: 'https://customerservice.scmp.com/img/logo_scmp@2x.png',
image: $('channel > image > url').text(),
- };
+ });
};
diff --git a/lib/v2/scmp/router.js b/lib/v2/scmp/router.js
index 34c464f029..93fe765e8c 100644
--- a/lib/v2/scmp/router.js
+++ b/lib/v2/scmp/router.js
@@ -1,5 +1,5 @@
module.exports = (router) => {
- router.redirect('/coronavirus', '/scmp/topics/coronavirus-pandemic-all-stories');
+ router.get('/coronavirus', (c) => c.redirect('/scmp/topics/coronavirus-pandemic-all-stories'));
router.get('/:category_id', require('./index'));
router.get('/topics/:topic', require('./topic'));
};
diff --git a/lib/v2/scmp/topic.js b/lib/v2/scmp/topic.js
index 30e3968e17..cbc562f433 100644
--- a/lib/v2/scmp/topic.js
+++ b/lib/v2/scmp/topic.js
@@ -1,14 +1,14 @@
-const cheerio = require('cheerio');
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
+import { load } from 'cheerio';
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
const { parseItem } = require('./utils');
module.exports = async (ctx) => {
const { topic } = ctx.params;
- const limit = Number.parseInt(ctx.query.limit, 10) || 30;
+ const limit = Number.parseInt(ctx.req.query('limit'), 10) || 30;
const pageUrl = `https://www.scmp.com/topics/${topic}`;
const { data: pageResponse } = await got(pageUrl);
- const $ = cheerio.load(pageResponse);
+ const $ = load(pageResponse);
const nextData = JSON.parse($('script#__NEXT_DATA__').text());
const topicData = nextData.props.pageProps.payload.data.topic;
@@ -48,12 +48,12 @@ module.exports = async (ctx) => {
const items = await Promise.all(list.map((item) => ctx.cache.tryGet(item.link, () => parseItem(item))));
- ctx.state.json = {
+ ctx.set('json', {
nextData,
apiResponse,
- };
+ });
- ctx.state.data = {
+ ctx.set('data', {
title: topicData.name,
link: pageUrl,
description: topicData.description.text,
@@ -62,5 +62,5 @@ module.exports = async (ctx) => {
icon: 'https://assets.i-scmp.com/static/img/icons/scmp-icon-256x256.png',
logo: 'https://customerservice.scmp.com/img/logo_scmp@2x.png',
image: 'https://assets-v2.i-scmp.com/production/_next/static/media/default-image.d1be8967.png',
- };
+ });
};
diff --git a/lib/v2/scmp/utils.js b/lib/v2/scmp/utils.js
index 5b6dfdf77b..540bd09414 100644
--- a/lib/v2/scmp/utils.js
+++ b/lib/v2/scmp/utils.js
@@ -1,6 +1,6 @@
-const cheerio = require('cheerio');
-const got = require('@/utils/got');
-const { parseDate } = require('@/utils/parse-date');
+import { load } from 'cheerio';
+import got from '@/utils/got';
+import { parseDate } from '@/utils/parse-date';
const renderHTML = (node) => {
if (!node) {
@@ -67,7 +67,7 @@ const parseItem = async (item) => {
return item;
}
- const $ = cheerio.load(response);
+ const $ = load(response);
const nextData = JSON.parse($('script#__NEXT_DATA__').text());
const { article } = nextData.props.pageProps.payload.data;
diff --git a/lib/v2/scnu/cs/match.js b/lib/v2/scnu/cs/match.js
index 70c336a70e..7f1fa92645 100644
--- a/lib/v2/scnu/cs/match.js
+++ b/lib/v2/scnu/cs/match.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const baseUrl = 'http://cs.scnu.edu.cn';
@@ -12,10 +12,10 @@ module.exports = async (ctx) => {
Referer: baseUrl,
},
});
- const $ = cheerio.load(res.data);
+ const $ = load(res.data);
const list = $('.listshow li a');
- ctx.state.data = {
+ ctx.set('data', {
title: $('title').text(),
link: url,
description: '华南师范大学计算机学院 学科竞赛',
@@ -32,5 +32,5 @@ module.exports = async (ctx) => {
link: item.attr('href'),
};
}),
- };
+ });
};
diff --git a/lib/v2/scnu/jw.js b/lib/v2/scnu/jw.js
index 38b1b201b9..df1272e339 100644
--- a/lib/v2/scnu/jw.js
+++ b/lib/v2/scnu/jw.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const baseUrl = 'http://jw.scnu.edu.cn';
@@ -12,10 +12,10 @@ module.exports = async (ctx) => {
Referer: baseUrl,
},
});
- const $ = cheerio.load(res.data);
+ const $ = load(res.data);
const list = $('.notice_01').find('li');
- ctx.state.data = {
+ ctx.set('data', {
title: $('title').first().text(),
link: url,
description: '华南师范大学教务处 - 通知公告',
@@ -29,5 +29,5 @@ module.exports = async (ctx) => {
link: item.find('a').attr('href'),
};
}),
- };
+ });
};
diff --git a/lib/v2/scnu/library.js b/lib/v2/scnu/library.js
index d5cfbb5a02..e36cf95ff0 100644
--- a/lib/v2/scnu/library.js
+++ b/lib/v2/scnu/library.js
@@ -1,6 +1,6 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const baseUrl = 'https://lib.scnu.edu.cn';
@@ -12,10 +12,10 @@ module.exports = async (ctx) => {
Referer: baseUrl,
},
});
- const $ = cheerio.load(res.data);
+ const $ = load(res.data);
const list = $('.article-list').find('li');
- ctx.state.data = {
+ ctx.set('data', {
title: $('title').text(),
link: url,
description: '华南师范大学图书馆 - 通知公告',
@@ -29,5 +29,5 @@ module.exports = async (ctx) => {
link: item.find('a').attr('href'),
};
}),
- };
+ });
};
diff --git a/lib/v2/scnu/physics-school-announcements-and-news.js b/lib/v2/scnu/physics-school-announcements-and-news.js
index b891a05bb8..0e92331850 100644
--- a/lib/v2/scnu/physics-school-announcements-and-news.js
+++ b/lib/v2/scnu/physics-school-announcements-and-news.js
@@ -1,11 +1,11 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const timezone = require('@/utils/timezone');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import timezone from '@/utils/timezone';
+import { parseDate } from '@/utils/parse-date';
const getAritlces = async (category, url, cache) => {
const { data } = await got(url);
- const $ = cheerio.load(data);
+ const $ = load(data);
const spiderResult = $('ul.article-list')
.children()
.toArray()
@@ -24,7 +24,7 @@ const getAritlces = async (category, url, cache) => {
.map((item) =>
cache.tryGet(item.link, async () => {
const { data } = await got(item.link);
- const $ = cheerio.load(data);
+ const $ = load(data);
const aritcleContent = $(data).find('div.detail').html();
item.description = aritcleContent;
return item;
@@ -53,11 +53,11 @@ module.exports.announcementsRouter = async (ctx) => {
学工: 'https://physics.scnu.edu.cn/NEWS/Notices/Students/',
};
const items = await getItemsFromURLs(URLs, ctx.cache);
- ctx.state.data = {
+ ctx.set('data', {
title: '华南师范大学物理与电信工程学院通知',
link: 'https://physics.scnu.edu.cn/NEWS/Notices/',
item: items,
- };
+ });
};
module.exports.newsRouter = async (ctx) => {
@@ -86,9 +86,9 @@ module.exports.researchNewsRouter = async (ctx) => {
科研成果: 'https://physics.scnu.edu.cn/RESEARCH/Achievements/',
};
const items = await getItemsFromURLs(URLs, ctx.cache);
- ctx.state.data = {
+ ctx.set('data', {
title: '华南师范大学物理与电信工程学院科学研究动态',
link: 'https://physics.scnu.edu.cn/RESEARCH/',
item: items,
- };
+ });
};
diff --git a/lib/v2/scnu/ss.js b/lib/v2/scnu/ss.js
index 9309e1842e..56cadfcd4a 100644
--- a/lib/v2/scnu/ss.js
+++ b/lib/v2/scnu/ss.js
@@ -1,14 +1,14 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
-const { parseDate } = require('@/utils/parse-date');
+import got from '@/utils/got';
+import { load } from 'cheerio';
+import { parseDate } from '@/utils/parse-date';
module.exports = async (ctx) => {
const link = 'http://ss.scnu.edu.cn/tongzhigonggao/';
const response = await got(link);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('.listshow li a');
- ctx.state.data = {
+ ctx.set('data', {
title: '华南师范大学软件学院',
link,
item:
@@ -24,5 +24,5 @@ module.exports = async (ctx) => {
pubDate: parseDate(item.find('.time').text()),
};
}),
- };
+ });
};
diff --git a/lib/v2/scnu/yjs.js b/lib/v2/scnu/yjs.js
index d5497ef822..068e1d88f5 100644
--- a/lib/v2/scnu/yjs.js
+++ b/lib/v2/scnu/yjs.js
@@ -1,13 +1,13 @@
-const got = require('@/utils/got');
-const cheerio = require('cheerio');
+import got from '@/utils/got';
+import { load } from 'cheerio';
module.exports = async (ctx) => {
const link = 'https://yz.scnu.edu.cn/tongzhigonggao/ssgg/';
const response = await got(link);
- const $ = cheerio.load(response.data);
+ const $ = load(response.data);
const list = $('.listmod div a');
- ctx.state.data = {
+ ctx.set('data', {
title: '华南师范大学研究生院',
link,
description: '华南师范大学研究生院通知公告',
@@ -20,5 +20,5 @@ module.exports = async (ctx) => {
link: item.attr('href'),
};
}),
- };
+ });
};
diff --git a/lib/v2/sctv/programme.js b/lib/v2/sctv/programme.js
index 0cb75e05d4..e2ea04b753 100644
--- a/lib/v2/sctv/programme.js
+++ b/lib/v2/sctv/programme.js
@@ -1,13 +1,13 @@
-const got = require('@/utils/got');
-const timezone = require('@/utils/timezone');
-const { parseDate } = require('@/utils/parse-date');
-const { art } = require('@/utils/render');
+import got from '@/utils/got';
+import timezone from '@/utils/timezone';
+import { parseDate } from '@/utils/parse-date';
+import { art } from '@/utils/render';
const path = require('path');
module.exports = async (ctx) => {
- const id = ctx.params.id ?? '1';
- const limit = ctx.params.limit ? Number.parseInt(ctx.params.limit) : 15;
- const isFull = /t|y/i.test(ctx.params.isFull ?? 'true');
+ const id = ctx.req.param('id') ?? '1';
+ const limit = ctx.req.param('limit') ? Number.parseInt(ctx.req.param('limit')) : 15;
+ const isFull = /t|y/i.test(ctx.req.param('isFull') ?? 'true');
const rootUrl = 'https://www.sctv.com';
const apiRootUrl = 'https://kscgc.sctv-tf.com';
@@ -71,10 +71,10 @@ module.exports = async (ctx) => {
}
}
- ctx.state.data = {
+ ctx.set('data', {
title: `四川广播电视台 - ${name}`,
link: currentUrl,
- item: items.slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 100),
+ item: items.slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 100),
image: cover,
- };
+ });
};
diff --git a/lib/v2/scut/jwc/news.js b/lib/v2/scut/jwc/news.js
index 0e85036778..c6d2d504fe 100644
--- a/lib/v2/scut/jwc/news.js
+++ b/lib/v2/scut/jwc/news.js
@@ -1,4 +1,4 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
const url = require('url');
const querystring = require('querystring');
@@ -103,9 +103,9 @@ module.exports = async (ctx) => {
})
);
- ctx.state.data = {
+ ctx.set('data', {
title: '华南理工大学教务处新闻动态',
link: listPageUrl,
item: out,
- };
+ });
};
diff --git a/lib/v2/scut/jwc/notice.js b/lib/v2/scut/jwc/notice.js
index b5584784f5..e8d207b3fc 100644
--- a/lib/v2/scut/jwc/notice.js
+++ b/lib/v2/scut/jwc/notice.js
@@ -1,4 +1,4 @@
-const got = require('@/utils/got');
+import got from '@/utils/got';
const url = require('url');
const querystring = require('querystring');
@@ -54,7 +54,7 @@ const generateArticleLink = (id) => `
链接： resolveRelativeUrl(data.content) + generateArticleLink(data.id); module.exports = async (ctx) => { - const categoryName = ctx.params.category || 'all'; + const categoryName = ctx.req.param('category') || 'all'; const categoryMeta = categoryMap[categoryName]; const qs = querystring.stringify({ @@ -113,9 +113,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: '华南理工大学教务处学院通知 - ' + categoryMeta.title, link: listPageUrl, item: out, - }; + }); }; diff --git a/lib/v2/scut/scet/notice.js b/lib/v2/scut/scet/notice.js index 590461159d..4f9ed51e8a 100644 --- a/lib/v2/scut/scet/notice.js +++ b/lib/v2/scut/scet/notice.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; module.exports = async (ctx) => { const link = 'https://www2.scut.edu.cn/jtxs/24241/list.htm'; @@ -10,10 +10,10 @@ module.exports = async (ctx) => { const data = response.data; - const $ = cheerio.load(data); + const $ = load(data); const list = $('#wp_news_w5 li'); - ctx.state.data = { + ctx.set('data', { title: '华南理工大学土木与交通学院 - 学工通知', link, item: @@ -27,5 +27,5 @@ module.exports = async (ctx) => { pubDate: item.find('.Article_PublishDate').text(), }; }), - }; + }); }; diff --git a/lib/v2/scut/seie/news-ccenter.js b/lib/v2/scut/seie/news-ccenter.js index f042d0000c..f59b5273ca 100644 --- a/lib/v2/scut/seie/news-ccenter.js +++ b/lib/v2/scut/seie/news-ccenter.js @@ -1,12 +1,12 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const rootUrl = 'https://www2.scut.edu.cn'; const url = `${rootUrl}/ee/16285/list.htm`; const response = await got(url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.news_ul li'); const articleList = list.toArray().map((item) => { @@ -23,7 +23,7 @@ module.exports = async (ctx) => { articleList.map((item) => ctx.cache.tryGet(item.link, async () => { const detailResponse = await got(`${rootUrl}${item.link}`); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); content('.wp_articlecontent *').each((_, child) => { const childElem = content(child); @@ -44,9 +44,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '华南理工大学电子与信息学院 - 新闻速递', link: url, item: items, - }; + }); }; diff --git a/lib/v2/scut/smae/notice.js b/lib/v2/scut/smae/notice.js index 4a15351807..b5c22d13f8 100644 --- a/lib/v2/scut/smae/notice.js +++ b/lib/v2/scut/smae/notice.js @@ -1,7 +1,7 @@ // 导入必要的模组 -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const categoryMap = { gwxx: { title: '公务信息', tag: '20616' }, @@ -16,12 +16,12 @@ const categoryMap = { module.exports = async (ctx) => { const baseUrl = 'http://www2.scut.edu.cn'; - const categoryName = ctx.params.category || 'yjsjw'; + const categoryName = ctx.req.param('category') || 'yjsjw'; const categoryMeta = categoryMap[categoryName]; const url = `${baseUrl}/smae/${categoryMeta.tag}/list.htm`; const { data: response } = await got(url); - const $ = cheerio.load(response); + const $ = load(response); const list = $('#wp_news_w6 ul li.news') .toArray() .map((item) => { @@ -38,7 +38,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const { data: response } = await got(item.link); - const $ = cheerio.load(response); + const $ = load(response); item.description = $('div.wp_articlecontent').html(); @@ -46,9 +46,9 @@ module.exports = async (ctx) => { }) ) ); - ctx.state.data = { + ctx.set('data', { title: `华南理工大学机械与汽车工程学院 - ${categoryMeta.title}`, link: url, item: items, - }; + }); }; diff --git a/lib/v2/scut/yjs.js b/lib/v2/scut/yjs.js index a1ac8457cb..77df9ff825 100644 --- a/lib/v2/scut/yjs.js +++ b/lib/v2/scut/yjs.js @@ -1,15 +1,15 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const baseUrl = 'https://www2.scut.edu.cn'; const link = `${baseUrl}/graduate/14562/list.htm`; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('#wp_news_w4 a'); - ctx.state.data = { + ctx.set('data', { title: '华南理工大学研究生院', link, description: '华南理工大学研究生院通知公告', @@ -26,5 +26,5 @@ module.exports = async (ctx) => { pubDate: parseDate(item.find('span').text()), }; }), - }; + }); }; diff --git a/lib/v2/scvtc/xygg.js b/lib/v2/scvtc/xygg.js index e316aaab38..f0b43b9ffd 100644 --- a/lib/v2/scvtc/xygg.js +++ b/lib/v2/scvtc/xygg.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const currentUrl = 'https://www.scvtc.edu.cn/ggfw1/xygg.htm'; const response = await got(currentUrl); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('div.text-list ul li') .toArray() .map((item) => { @@ -22,7 +22,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const detailResponse = await got(item.link); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('#vsb_content').html(); @@ -31,10 +31,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('head title').text(), decription: $('meta[name=description]').attr('content'), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/sdu/cmse.js b/lib/v2/sdu/cmse.js index 957b6afd68..74755f8402 100644 --- a/lib/v2/sdu/cmse.js +++ b/lib/v2/sdu/cmse.js @@ -1,17 +1,17 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const host = 'http://www.cmse.sdu.edu.cn/'; const typelist = ['通知公告', '学院新闻', '本科生教育', '研究生教育', '学术动态']; const urlList = ['zxzx/tzgg.htm', 'zxzx/xyxw.htm', 'zxzx/bksjy.htm', 'zxzx/yjsjy.htm', 'zxzx/xsdt.htm']; module.exports = async (ctx) => { - const type = ctx.params.type ? Number.parseInt(ctx.params.type) : 0; + const type = ctx.req.param('type') ? Number.parseInt(ctx.req.param('type')) : 0; const link = new URL(urlList[type], host).href; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); let item = $('.article_list li') .map((_, e) => { @@ -32,7 +32,7 @@ module.exports = async (ctx) => { item.link = new URL(item.link.slice('3'), host).href; return ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.title = $('.contentTitle').text(); item.author = @@ -50,10 +50,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: `山东大学材料科学与工程学院${typelist[type]}`, description: $('title').text(), link, item, - }; + }); }; diff --git a/lib/v2/sdu/cs.js b/lib/v2/sdu/cs.js index 7b4386bee2..a4310e351d 100644 --- a/lib/v2/sdu/cs.js +++ b/lib/v2/sdu/cs.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const { finishArticleItem } = require('@/utils/wechat-mp'); const host = 'https://www.cs.sdu.edu.cn/'; @@ -8,12 +8,12 @@ const typelist = ['学院公告', '学术报告', '科技简讯']; const urlList = ['xygg.htm', 'xsbg.htm', 'kjjx.htm']; module.exports = async (ctx) => { - const type = ctx.params.type ? Number.parseInt(ctx.params.type) : 0; + const type = ctx.req.param('type') ? Number.parseInt(ctx.req.param('type')) : 0; const link = new URL(urlList[type], host).href; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); let item = $('.dqlb ul li') .map((_, e) => { @@ -36,7 +36,7 @@ module.exports = async (ctx) => { return item; } const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.title = $('.xqnr_tit h2').text().trim(); item.author = $('.xqnr_tit span').eq(1).text().trim().replace('编辑：', '') || '山东大学计算机科学与技术学院'; @@ -48,10 +48,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `山东大学计算机科学与技术学院${typelist[type]}通知`, description: $('title').text(), link, item, - }; + }); }; diff --git a/lib/v2/sdu/epe.js b/lib/v2/sdu/epe.js index e71d375503..0467596b5d 100644 --- a/lib/v2/sdu/epe.js +++ b/lib/v2/sdu/epe.js @@ -1,18 +1,18 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const host = 'https://www.epe.sdu.edu.cn/'; const typelist = ['学院动态', '通知公告', '学术论坛']; const urlList = ['zxzx/xydt.htm', 'zxzx/tzgg.htm', 'zxzx/xslt.htm']; module.exports = async (ctx) => { - const type = ctx.params.type ? Number.parseInt(ctx.params.type) : 0; + const type = ctx.req.param('type') ? Number.parseInt(ctx.req.param('type')) : 0; const link = new URL(urlList[type], host).href; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); let item = $('#page_right_main li a') .map((_, e) => { @@ -31,7 +31,7 @@ module.exports = async (ctx) => { item.link = new URL(item.link.slice('3'), host).href; return ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const info = $('#show_info').text().split(/\s{4}/); const date = info[0].split('：')[1]; @@ -46,10 +46,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: `山东大学能源与动力工程学院${typelist[type]}`, description: $('title').text(), link, item, - }; + }); }; diff --git a/lib/v2/sdu/extractor/sdrj.js b/lib/v2/sdu/extractor/sdrj.js index 42adf19cf3..1e43c125c7 100644 --- a/lib/v2/sdu/extractor/sdrj.js +++ b/lib/v2/sdu/extractor/sdrj.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = (link, ctx) => ctx.cache.tryGet(link, async () => { let content, author, exactDate; try { const result = await got(link); - const $ = cheerio.load(result.data); + const $ = load(result.data); content = $('#vsb_content').html(); author = $("form[name='_newscontent_fromname'] > h1").text(); const exactDateLine = $("form[name='_newscontent_fromname'] > p.info").text().trim(); diff --git a/lib/v2/sdu/extractor/view.js b/lib/v2/sdu/extractor/view.js index ff5e39b921..e9393ac469 100644 --- a/lib/v2/sdu/extractor/view.js +++ b/lib/v2/sdu/extractor/view.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = (link, ctx) => ctx.cache.tryGet(link, async () => { let content, author, exactDate; try { const result = await got(link); - const $ = cheerio.load(result.data); + const $ = load(result.data); content = $('#vsb_content').html(); author = $("form[name='_newscontent_fromname'] > div > p:last-of-type").text(); const exactDateLine = $('.news_tit > p:last-child').text(); diff --git a/lib/v2/sdu/extractor/wh/jwc.js b/lib/v2/sdu/extractor/wh/jwc.js index ede8c49ada..88083fb5dd 100644 --- a/lib/v2/sdu/extractor/wh/jwc.js +++ b/lib/v2/sdu/extractor/wh/jwc.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = (link, ctx) => ctx.cache.tryGet(link, async () => { let content, exactDate; try { const result = await got(link); - const $ = cheerio.load(result.data); + const $ = load(result.data); const form = $("form[name='_newscontent_fromname']"); form.find('h2').remove(); const exactDateElement = form.find('#author'); diff --git a/lib/v2/sdu/extractor/wh/news.js b/lib/v2/sdu/extractor/wh/news.js index c5ff784a70..63a0135bea 100644 --- a/lib/v2/sdu/extractor/wh/news.js +++ b/lib/v2/sdu/extractor/wh/news.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = (link, ctx) => ctx.cache.tryGet(link, async () => { let content, author, exactDate; try { const result = await got(link); - const $ = cheerio.load(result.data); + const $ = load(result.data); content = $('#main-content').html(); author = $('#source').text(); const exactDateLine = $('.news_tit > p:last-child').text(); diff --git a/lib/v2/sdu/mech.js b/lib/v2/sdu/mech.js index 93c2cdf621..c332e39674 100644 --- a/lib/v2/sdu/mech.js +++ b/lib/v2/sdu/mech.js @@ -1,18 +1,18 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const typelist = ['通知公告', '院所新闻', '教学信息', '学术动态', '学院简报']; const urlList = ['xwdt/tzgg.htm', 'xwdt/ysxw.htm', 'xwdt/jxxx.htm', 'xwdt/xsdt.htm', 'xwdt/xyjb.htm']; const host = 'https://www.mech.sdu.edu.cn/'; module.exports = async (ctx) => { - const type = ctx.params.type ? Number.parseInt(ctx.params.type) : 0; + const type = ctx.req.param('type') ? Number.parseInt(ctx.req.param('type')) : 0; const link = new URL(urlList[type], host).href; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); let item = $('#page_list li a') .slice(0, 1) @@ -35,7 +35,7 @@ module.exports = async (ctx) => { } return ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const info = $('#show_info').text().split(/\s{4}/); const date = info[0].split('：')[1]; @@ -51,10 +51,10 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: `山东大学机械工程学院${typelist[type]}`, description: $('title').text(), link, item, - }; + }); }; diff --git a/lib/v2/sdu/sc.js b/lib/v2/sdu/sc.js index 9fe5c26df4..69fac7b3cf 100644 --- a/lib/v2/sdu/sc.js +++ b/lib/v2/sdu/sc.js @@ -1,17 +1,17 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const host = 'https://www.sc.sdu.edu.cn/'; const typelist = ['通知公告', '学术动态', '本科教育', '研究生教育']; const urlList = ['tzgg.htm', 'kxyj/xsyg.htm', 'rcpy/bkjy.htm', 'rcpy/yjsjy.htm']; module.exports = async (ctx) => { - const type = ctx.params.type ? Number.parseInt(ctx.params.type) : 0; + const type = ctx.req.param('type') ? Number.parseInt(ctx.req.param('type')) : 0; const link = new URL(urlList[type], host).href; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); let item = $('.newlist01 li') .map((_, e) => { @@ -32,7 +32,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(item.link, async () => { try { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.title = $('h3').text(); item.author = @@ -52,10 +52,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `山东大学软件学院${typelist[type]}`, description: $('title').text(), link, item, - }; + }); }; diff --git a/lib/v2/sdu/wh/jwc.js b/lib/v2/sdu/wh/jwc.js index e664d38f07..e00c546ff1 100644 --- a/lib/v2/sdu/wh/jwc.js +++ b/lib/v2/sdu/wh/jwc.js @@ -1,15 +1,15 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const data = require('../data').wh.jwc; const extractor = require('../extractor'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; module.exports = async (ctx) => { - const column = ctx.params.column ?? 'gztz'; + const column = ctx.req.param('column') ?? 'gztz'; const baseUrl = data.url; const response = await got(baseUrl + data.columns[column].url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const items = $('.articleul li'); const out = await Promise.all( items.map(async (index, item) => { @@ -34,9 +34,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: `${data.name} ${data.columns[column].name}`, link: baseUrl + data.columns[column].url, item: out, - }; + }); }; diff --git a/lib/v2/sdu/wh/news.js b/lib/v2/sdu/wh/news.js index 1abd255945..93d8d64ee6 100644 --- a/lib/v2/sdu/wh/news.js +++ b/lib/v2/sdu/wh/news.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const data = require('../data').wh.news; const extractor = require('../extractor'); -const { parseDate } = require('@/utils/parse-date'); +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const column = ctx.params.column ?? 'xyyw'; + const column = ctx.req.param('column') ?? 'xyyw'; const baseUrl = data.url; const response = await got(baseUrl + data.columns[column].url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const items = $('.n_newslist li'); const out = await Promise.all( items.map(async (index, item) => { @@ -30,9 +30,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: `${data.name} ${data.columns[column].name}`, link: baseUrl + data.columns[column].url, item: out, - }; + }); }; diff --git a/lib/v2/sdust/yjsy/zhaosheng.js b/lib/v2/sdust/yjsy/zhaosheng.js index 8cfc1144c3..1c52bb5b83 100644 --- a/lib/v2/sdust/yjsy/zhaosheng.js +++ b/lib/v2/sdust/yjsy/zhaosheng.js @@ -1,9 +1,9 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const id = ctx.params.id ?? 'tzgg'; + const id = ctx.req.param('id') ?? 'tzgg'; const rootUrl = 'https://yjsy.sdust.edu.cn'; const currentUrl = `${rootUrl}/zhaosheng/${id}.htm`; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('.pageUl ul li a') .toArray() @@ -35,7 +35,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); item.description = content('.txt, .v_news_content').html(); @@ -44,9 +44,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/sdzk/index.js b/lib/v2/sdzk/index.js index a6f7764d6b..eaa52c32e9 100644 --- a/lib/v2/sdzk/index.js +++ b/lib/v2/sdzk/index.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const bcid = ctx.params.bcid ?? '1'; - const cid = ctx.params.cid ?? '16'; + const bcid = ctx.req.param('bcid') ?? '1'; + const cid = ctx.req.param('cid') ?? '16'; const rootUrl = 'https://www.sdzk.cn'; const currentUrl = `${rootUrl}/NewsList.aspx?BCID=${bcid}${cid ? `&CID=${cid}` : ''}`; @@ -14,7 +14,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('a[title]') .toArray() @@ -35,7 +35,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); const info = content('div.laylist-r em').text(); @@ -47,9 +47,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: $('title').text(), link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/sec-in/index.js b/lib/v2/sec-in/index.js index d3e073d56d..43aabc0ed6 100644 --- a/lib/v2/sec-in/index.js +++ b/lib/v2/sec-in/index.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const { data } = await got('https://sec-in.com/api/v1/Common/getArticleList?tabs=newest'); @@ -11,9 +11,9 @@ module.exports = async (ctx) => { author: item.member_info.nickname, category: item.article_tag, })); - ctx.state.data = { + ctx.set('data', { title: 'SecIN信息安全技术社区', link: 'https://sec-in.com/', item: items, - }; + }); }; diff --git a/lib/v2/sec-wiki/weekly.js b/lib/v2/sec-wiki/weekly.js index adc0105390..315eebea9f 100644 --- a/lib/v2/sec-wiki/weekly.js +++ b/lib/v2/sec-wiki/weekly.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -// const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +// import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const { data } = await got('https://www.sec-wiki.com/weekly/index'); @@ -8,9 +8,9 @@ module.exports = async (ctx) => { link: `https://www.sec-wiki.com/weekly/${item[1]}`, description: item[3], })); - ctx.state.data = { + ctx.set('data', { title: 'SecWiki-安全维基', link: 'https://www.sec-wiki.com/', item: items, - }; + }); }; diff --git a/lib/v2/secrss/author.js b/lib/v2/secrss/author.js index ee221ff0c4..df9a8e95b8 100644 --- a/lib/v2/secrss/author.js +++ b/lib/v2/secrss/author.js @@ -1,10 +1,10 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import { load } from 'cheerio'; module.exports = async (ctx) => { const api = 'https://www.secrss.com/api/articles/group?author='; - const author = ctx.params.author; + const author = ctx.req.param('author'); const host = 'https://www.secrss.com'; const res = await got(`${api}${author}`); const dataArray = res.data.data.list; @@ -14,7 +14,7 @@ module.exports = async (ctx) => { const itemUrl = `${host}${item.url}`; return ctx.cache.tryGet(itemUrl, async () => { const result = await got(itemUrl); - const $ = cheerio.load(result.data); + const $ = load(result.data); const description = $('.article-body').html().trim(); return { title: item.title, @@ -27,9 +27,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: `安全内参-${author}`, link: 'https://www.secrss.com', item: items, - }; + }); }; diff --git a/lib/v2/secrss/category.js b/lib/v2/secrss/category.js index 212c43268d..8e0982d576 100644 --- a/lib/v2/secrss/category.js +++ b/lib/v2/secrss/category.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; +import { load } from 'cheerio'; module.exports = async (ctx) => { const api = 'https://www.secrss.com/api/articles?tag='; @@ -15,7 +15,7 @@ module.exports = async (ctx) => { const itemUrl = `${host}/articles/${item.id}`; return ctx.cache.tryGet(itemUrl, async () => { const result = await got(itemUrl); - const $ = cheerio.load(result.data); + const $ = load(result.data); const description = $('.article-body').html().trim(); return { title: item.title, @@ -29,9 +29,9 @@ module.exports = async (ctx) => { }) ); - ctx.state.data = { + ctx.set('data', { title: `安全内参-${category}`, link: 'https://www.secrss.com', item: items, - }; + }); }; diff --git a/lib/v2/seekingalpha/index.js b/lib/v2/seekingalpha/index.js index b7aea4dd8e..1e5ec817c5 100644 --- a/lib/v2/seekingalpha/index.js +++ b/lib/v2/seekingalpha/index.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const dayjs = require('dayjs'); const baseUrl = 'https://seekingalpha.com'; @@ -13,7 +13,7 @@ module.exports = async (ctx) => { cacheBuster: category === 'news' ? dayjs().format('YYYY-MM-DD') : undefined, id: symbol.toLowerCase(), include: 'author,primaryTickers,secondaryTickers,sentiments', - 'page[size]': ctx.query.limit ? Number(ctx.query.limit) : category === 'news' ? 40 : 20, + 'page[size]': ctx.req.query('limit') ? Number(ctx.req.query('limit')) : category === 'news' ? 40 : 20, }, }); @@ -29,7 +29,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const summary = $('[data-test-id=article-summary-title]').length ? $('[data-test-id=article-summary-title]').html() + $('[data-test-id=article-summary-title]').next().html() : ''; @@ -44,7 +44,7 @@ module.exports = async (ctx) => { ) : []; - ctx.state.data = { + ctx.set('data', { title: response.data.meta.page.title, description: response.data.meta.page.description, link: pageUrl, @@ -52,5 +52,5 @@ module.exports = async (ctx) => { item: items, allowEmpty: true, language: 'en-US', - }; + }); }; diff --git a/lib/v2/segmentfault/blogs.js b/lib/v2/segmentfault/blogs.js index 0ab77575c4..975b25119a 100644 --- a/lib/v2/segmentfault/blogs.js +++ b/lib/v2/segmentfault/blogs.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { host, acw_sc__v2, parseList, parseItems } = require('./utils'); module.exports = async (ctx) => { @@ -13,9 +13,9 @@ module.exports = async (ctx) => { const items = await Promise.all(list.map((item) => parseItems(acwScV2Cookie, item, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: `segmentfault-Blogs-${tag}`, link: `${host}/t/${tag}/blogs`, item: items, - }; + }); }; diff --git a/lib/v2/segmentfault/channel.js b/lib/v2/segmentfault/channel.js index 00d5306043..21e67bc42a 100644 --- a/lib/v2/segmentfault/channel.js +++ b/lib/v2/segmentfault/channel.js @@ -1,5 +1,5 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const { host, acw_sc__v2, parseList, parseItems } = require('./utils'); module.exports = async (ctx) => { @@ -12,12 +12,12 @@ module.exports = async (ctx) => { query: 'channel', slug: name, offset: 0, - size: ctx.query.limit ? Number.parseInt(ctx.query.limit, 10) : 20, + size: ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit'), 10) : 20, mode: 'scrollLoad', }, }); - const $ = cheerio.load(pageResponse); + const $ = load(pageResponse); const channelName = $('#leftNav > a.active').text(); const list = parseList(apiResponse.rows); @@ -26,9 +26,9 @@ module.exports = async (ctx) => { const items = await Promise.all(list.map((item) => parseItems(acwScV2Cookie, item, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: `segmentfault - ${channelName}`, link, item: items, - }; + }); }; diff --git a/lib/v2/segmentfault/user.js b/lib/v2/segmentfault/user.js index 636d374981..f645e0cac0 100644 --- a/lib/v2/segmentfault/user.js +++ b/lib/v2/segmentfault/user.js @@ -1,4 +1,4 @@ -const got = require('@/utils/got'); +import got from '@/utils/got'; const { host, acw_sc__v2, parseList, parseItems } = require('./utils'); module.exports = async (ctx) => { @@ -15,9 +15,9 @@ module.exports = async (ctx) => { const items = await Promise.all(list.map((item) => parseItems(acwScV2Cookie, item, ctx.cache.tryGet))); - ctx.state.data = { + ctx.set('data', { title: `segmentfault - ${author}`, link: `${host}/u/${name}`, item: items, - }; + }); }; diff --git a/lib/v2/segmentfault/utils.js b/lib/v2/segmentfault/utils.js index bf19c3e8a1..582962e79b 100644 --- a/lib/v2/segmentfault/utils.js +++ b/lib/v2/segmentfault/utils.js @@ -1,8 +1,8 @@ const zlib = require('zlib'); -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const config = require('@/config').value; +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { config } from '@/config'; const { getAcwScV2ByArg1 } = require('@/v2/5eplay/utils'); const host = 'https://segmentfault.com'; @@ -48,7 +48,7 @@ const parseItems = (cookie, item, tryGet) => cookie: `acw_sc__v2=${cookie};`, }, }); - const content = cheerio.load(response.data); + const content = load(response.data); item.description = content('article').html(); item.category = content('.badge-tag') diff --git a/lib/v2/sehuatang/index.js b/lib/v2/sehuatang/index.js index 5e298795db..b7dfdee722 100644 --- a/lib/v2/sehuatang/index.js +++ b/lib/v2/sehuatang/index.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const { CookieJar } = require('tough-cookie'); const cookieJar = new CookieJar(); @@ -38,7 +38,7 @@ const forumIdMaps = { }; module.exports = async (ctx) => { - const subformName = ctx.params.subforumid ?? 'gqzwzm'; + const subformName = ctx.req.param('subforumid') ?? 'gqzwzm'; const subformId = subformName in forumIdMaps ? forumIdMaps[subformName] : subformName; const { type } = ctx.params; const typefilter = type ? `&filter=typeid&typeid=${type}` : ''; @@ -53,10 +53,10 @@ module.exports = async (ctx) => { cookieJar, headers, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('#threadlisttableid tbody[id^=normalthread]') - .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 25) + .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 25) .toArray() .map((item) => { item = $(item); @@ -77,7 +77,7 @@ module.exports = async (ctx) => { headers, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const postMessage = $("td[id^='postmessage']").slice(0, 1); const images = $(postMessage).find('img'); for (const image of images) { @@ -121,9 +121,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `色花堂 - ${$('#pt > div:nth-child(1) > a:last-child').text()}`, link, item: out, - }; + }); }; diff --git a/lib/v2/sehuatang/user.js b/lib/v2/sehuatang/user.js index fbcfbdff1c..5bd151d6dd 100644 --- a/lib/v2/sehuatang/user.js +++ b/lib/v2/sehuatang/user.js @@ -1,8 +1,8 @@ // 导入必要的模组 -const got = require('@/utils/got'); // 自订的 got -const cheerio = require('cheerio'); // 可以使用类似 jQuery 的 API HTML 解析器 -const { parseDate } = require('@/utils/parse-date'); -const config = require('@/config').value; +import got from '@/utils/got'; // 自订的 got +import { load } from 'cheerio'; // 可以使用类似 jQuery 的 API HTML 解析器 +import { parseDate } from '@/utils/parse-date'; +import { config } from '@/config'; const baseUrl = 'https://sehuatang.org/'; @@ -11,7 +11,7 @@ module.exports = async (ctx) => { throw new Error('Sehuatang RSS is disabled due to the lack of relevant config'); } // 从Url参数中获取uid - const uid = ctx.params.uid; + const uid = ctx.req.param('uid'); const link = `${baseUrl}home.php?mod=space&uid=${uid}&do=thread&view=me&from=space`; const response = await got(link, { @@ -22,10 +22,10 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('#delform tr:not(.th)') - .slice(0, ctx.query.limit ? Number.parseInt(ctx.query.limit) : 25) + .slice(0, ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 25) .toArray() .map((item) => { item = $(item); @@ -51,7 +51,7 @@ module.exports = async (ctx) => { }, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); const postMessage = $("[id^='postmessage']").slice(0, 1); const images = $(postMessage).find('img'); for (const image of images) { @@ -103,10 +103,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { // 在此处输出您的 RSS title: `${$('.mt').text()}的帖子-色花堂`, link, item: out, - }; + }); }; diff --git a/lib/v2/sensortower/blog.js b/lib/v2/sensortower/blog.js index 5cab8617e5..ddcb88b43b 100644 --- a/lib/v2/sensortower/blog.js +++ b/lib/v2/sensortower/blog.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const path = require('path'); module.exports = async (ctx) => { - const language = ctx.params.language ?? ''; + const language = ctx.req.param('language') ?? ''; const rootUrl = 'https://sensortower.com'; const currentUrl = `${rootUrl}${language ? `/${language}` : ''}/blog`; @@ -29,7 +29,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); const detail = JSON.parse(`{${detailResponse.data.match(/("title":.*?),"body":/)[1]}}`); content('h1').remove(); @@ -60,10 +60,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: 'Sensor Tower - Blog', link: currentUrl, item: items, language: language ?? 'en-US', - }; + }); }; diff --git a/lib/v2/setn/index.js b/lib/v2/setn/index.js index 8dfc38f3ae..13d7d4b049 100644 --- a/lib/v2/setn/index.js +++ b/lib/v2/setn/index.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; const defaultRootUrl = 'https://www.setn.com'; @@ -42,8 +42,8 @@ const getCurrentUrl = (category) => { }; module.exports = async (ctx) => { - const category = ctx.params.category ?? '即時'; - const limit = ctx.query.limit ? Number.parseInt(ctx.query.limit) : 42; + const category = ctx.req.param('category') ?? '即時'; + const limit = ctx.req.query('limit') ? Number.parseInt(ctx.req.query('limit')) : 42; const currentUrl = getCurrentUrl(category); @@ -52,7 +52,7 @@ module.exports = async (ctx) => { url: currentUrl, }); - const $ = cheerio.load(response.data); + const $ = load(response.data); let items = $('#NewsList, .newsList, .hotNewsList') .find('.newsItems, .st-news, .all_three_list, div.title-word') @@ -78,7 +78,7 @@ module.exports = async (ctx) => { url: item.link, }); - const content = cheerio.load(detailResponse.data); + const content = load(detailResponse.data); content('#gad_setn_innity_oop_1x1').remove(); @@ -92,9 +92,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `三立新聞網 - ${category}`, link: currentUrl, item: items, - }; + }); }; diff --git a/lib/v2/seu/cse/index.js b/lib/v2/seu/cse/index.js index bac2cb9c58..c66daf2fd3 100644 --- a/lib/v2/seu/cse/index.js +++ b/lib/v2/seu/cse/index.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const host = 'https://cse.seu.edu.cn'; @@ -18,7 +18,7 @@ module.exports = async (ctx) => { const link = new URL(`${id}/list.htm`, host).href; const { data: response } = await got(link); - const $ = cheerio.load(response); + const $ = load(response); const list = $('.news_list .news') .toArray() @@ -45,7 +45,7 @@ module.exports = async (ctx) => { } throw error; } - const $ = cheerio.load(response.data); + const $ = load(response.data); item.description = $('div.wp_articlecontent').html(); @@ -54,10 +54,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { link, title: `${$('meta[name=keywords]').attr('content')}${$('meta[name=description]').attr('content')} -- ${$('head title').text()}`, description: '东南大学计算机技术与工程学院RSS', item: out, - }; + }); }; diff --git a/lib/v2/seu/radio/academic.js b/lib/v2/seu/radio/academic.js index e607decc1c..ccafeff0b7 100644 --- a/lib/v2/seu/radio/academic.js +++ b/lib/v2/seu/radio/academic.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const host = 'https://radio.seu.edu.cn'; const link = new URL('_s29/15986/list.psp', host).href; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.list_item') .toArray() @@ -25,7 +25,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.author = $('.arti_publisher').text().replace('发布者：', ''); item.description = $('.wp_articlecontent').html(); @@ -35,9 +35,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '东南大学信息科学与工程学院 -- 学术活动', link, item: out, - }; + }); }; diff --git a/lib/v2/seu/yjs.js b/lib/v2/seu/yjs.js index b0037a9612..1862e5b94c 100644 --- a/lib/v2/seu/yjs.js +++ b/lib/v2/seu/yjs.js @@ -1,11 +1,11 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const url = 'https://seugs.seu.edu.cn/26671/list.htm'; module.exports = async (ctx) => { const response = await got(url); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $('.news') .toArray() .map((element) => { @@ -21,7 +21,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.description = $('.wp_articlecontent').html(); item.pubDate = new Date(item.date).toUTCString(); return item; @@ -29,9 +29,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: '东南大学研究生公告', link: url, item: items, - }; + }); }; diff --git a/lib/v2/seu/yzb/index.js b/lib/v2/seu/yzb/index.js index ab545a2c21..773243829d 100644 --- a/lib/v2/seu/yzb/index.js +++ b/lib/v2/seu/yzb/index.js @@ -1,6 +1,6 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { const host = 'https://yzb.seu.edu.cn'; @@ -16,7 +16,7 @@ module.exports = async (ctx) => { const url = new URL(`${id}/list.htm`, host).href; const { data: response } = await got(url); - const $ = cheerio.load(response); + const $ = load(response); const list = $('#wp_news_w3 td tbody tr') .toArray() @@ -34,7 +34,7 @@ module.exports = async (ctx) => { list.map((item) => ctx.cache.tryGet(item.link, async () => { const { data: response } = await got(item.link); - const $ = cheerio.load(response); + const $ = load(response); item.description = $('.Article_Content').html(); @@ -43,9 +43,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { link: url, title: `东南大学研究生招生网 -- ${$('head title').text()}`, item: items, - }; + }); }; diff --git a/lib/v2/shcstheatre/programs.js b/lib/v2/shcstheatre/programs.js index 5d3776644d..c33ad37966 100644 --- a/lib/v2/shcstheatre/programs.js +++ b/lib/v2/shcstheatre/programs.js @@ -1,14 +1,14 @@ -const got = require('@/utils/got'); -const { art } = require('@/utils/render'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { art } from '@/utils/render'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; +import { load } from 'cheerio'; const path = require('path'); module.exports = async (ctx) => { const url = 'https://www.shcstheatre.com/Program/programList.aspx'; const res = await got.get(url); - const $ = cheerio.load(res.data); + const $ = load(res.data); const items = await Promise.all( $('#datarow .program-name a').map((_, elem) => { const link = new URL($(elem).attr('href'), url); @@ -30,10 +30,10 @@ module.exports = async (ctx) => { ); const image = $('.menu-logo img').attr('src'); - ctx.state.data = { + ctx.set('data', { title: '上海文化广场 - 节目列表', link: url, image, item: items, - }; + }); }; diff --git a/lib/v2/shiep/index.js b/lib/v2/shiep/index.js index 2c5ecd9001..9850146dac 100644 --- a/lib/v2/shiep/index.js +++ b/lib/v2/shiep/index.js @@ -1,13 +1,13 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); +import got from '@/utils/got'; +import { load } from 'cheerio'; const dayjs = require('dayjs'); const path = require('path'); -const { parseDate } = require('@/utils/parse-date'); -const { art } = require('@/utils/render'); +import { parseDate } from '@/utils/parse-date'; +import { art } from '@/utils/render'; const { config } = require('./config'); module.exports = async (ctx) => { - const type = ctx.params.type; + const type = ctx.req.param('type'); if (!Object.keys(config).includes(type)) { throw new Error(`Invalid type: ${type}`); @@ -20,11 +20,11 @@ module.exports = async (ctx) => { } const host = `https://${type}.shiep.edu.cn`; - const id = ctx.params.id || config[type].id; + const id = ctx.req.param('id') || config[type].id; const link = type === 'career' ? `${host}/news/index/tag/${id}` : `${host}/${id}/list.htm`; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const list = $(listSelector) .toArray() @@ -48,7 +48,7 @@ module.exports = async (ctx) => { ctx.cache.tryGet(item.link, async () => { try { const response = await got(item.link); - const $ = cheerio.load(response.data); + const $ = load(response.data); item.description = $(descriptionSelector).length > 0 @@ -64,9 +64,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `上海电力大学-${title}`, link, item: items, - }; + }); }; diff --git a/lib/v2/shisu/news.js b/lib/v2/shisu/news.js index bc58b68c50..78da8b50a2 100644 --- a/lib/v2/shisu/news.js +++ b/lib/v2/shisu/news.js @@ -1,7 +1,7 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const { parseDate } = require('@/utils/parse-date'); -const timezone = require('@/utils/timezone'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import { parseDate } from '@/utils/parse-date'; +import timezone from '@/utils/timezone'; const url = 'https://news.shisu.edu.cn'; const banner = 'https://news.shisu.edu.cn/news/index/39adf3d9ae414bc39c6d3b9316ae531f.png'; @@ -9,7 +9,7 @@ const banner = 'https://news.shisu.edu.cn/news/index/39adf3d9ae414bc39c6d3b9316a module.exports = async (ctx) => { const { section = 'news' } = ctx.params; const { data: r } = await got(`${url}/${section}/index.html`); - const $ = cheerio.load(r); + const $ = load(r); let itemsoup; switch (section) { case 'news': @@ -42,7 +42,7 @@ module.exports = async (ctx) => { itemsoup.map((j) => ctx.cache.tryGet(j.link, async () => { const { data: r } = await got(j.link); - const $ = cheerio.load(r); + const $ = load(r); const img = $('.tempWrap > ul > li:nth-child(1)> img').attr('src'); j.description = $('.ot_main_r .content').html(); j.author = $('.math_time_l > span:nth-child(3)').text().trim(); @@ -55,10 +55,10 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title: `上外新闻|SISU TODAY -${section.charAt(0).toUpperCase() + section.slice(1)}`, image: 'https://bkimg.cdn.bcebos.com/pic/8d5494eef01f3a296b70affa9825bc315c607c4d?x-bce-process=image/resize,m_lfit,w_536,limit_1/quality,Q_70', link: `${url}/${section}/index.html`, item: items, - }; + }); }; diff --git a/lib/v2/shmeea/index.js b/lib/v2/shmeea/index.js index 6fc1c22f39..87aba2d6e2 100644 --- a/lib/v2/shmeea/index.js +++ b/lib/v2/shmeea/index.js @@ -1,15 +1,15 @@ -const got = require('@/utils/got'); -const cheerio = require('cheerio'); -const timezone = require('@/utils/timezone'); -const { parseDate } = require('@/utils/parse-date'); +import got from '@/utils/got'; +import { load } from 'cheerio'; +import timezone from '@/utils/timezone'; +import { parseDate } from '@/utils/parse-date'; module.exports = async (ctx) => { - const id = ctx.params.id ?? '08000'; + const id = ctx.req.param('id') ?? '08000'; const baseURL = 'https://www.shmeea.edu.cn'; const link = `${baseURL}/page/${id}/index.html`; const response = await got(link); - const $ = cheerio.load(response.data); + const $ = load(response.data); const title = `上海市教育考试院-${$('#main .pageh4-tit').text().trim()}`; @@ -32,7 +32,7 @@ module.exports = async (ctx) => { } const result = await got(item.link); - const $ = cheerio.load(result.data); + const $ = load(result.data); const description = $('#ivs_content').html(); const pbTimeText = $('#ivs_title .PBtime').text().trim(); @@ -45,9 +45,9 @@ module.exports = async (ctx) => { ) ); - ctx.state.data = { + ctx.set('data', { title, link, item: items, - }; + }); };