diff --git a/docs/en/new-media.md b/docs/en/new-media.md index 29e99a45c8..640b8a3683 100644 --- a/docs/en/new-media.md +++ b/docs/en/new-media.md @@ -8,10 +8,10 @@ pageClass: routes ### 9To5 Sub-site - + Supported sub-sites: -| Mac | Google | Toys | +| 9To5Mac | 9To5Google | 9To5Toys | | --- | ------ | ---- | | Mac | Google | Toys | diff --git a/docs/new-media.md b/docs/new-media.md index 707ebd59a4..9bbf2ec0c0 100644 --- a/docs/new-media.md +++ b/docs/new-media.md @@ -18,10 +18,10 @@ pageClass: routes ### 9To5 分站 - + 支持分站: -| Mac | Google | Toys | +| 9To5Mac | 9To5Google | 9To5Toys | | --- | ------ | ---- | | Mac | Google | Toys | diff --git a/lib/router.js b/lib/router.js index cc9e2de390..eb4d440cfe 100644 --- a/lib/router.js +++ b/lib/router.js @@ -955,7 +955,7 @@ router.get('/gitea/blog', require('./routes/gitea/blog')); router.get('/idownloadblog', require('./routes/idownloadblog/index')); // 9to5 -router.get('/9to5/:type', require('./routes/9to5/subsite')); +router.get('/9to5/:subsite/:tag?', require('./routes/9to5/subsite')); // TesterHome router.get('/testerhome/newest', require('./routes/testerhome/newest')); diff --git a/lib/routes/9to5/subsite.js b/lib/routes/9to5/subsite.js index 63930fd242..3764a2f154 100644 --- a/lib/routes/9to5/subsite.js +++ b/lib/routes/9to5/subsite.js @@ -7,21 +7,21 @@ module.exports = async (ctx) => { link, description; - switch (ctx.params.type) { + switch (ctx.params.subsite) { case 'mac': - link = 'https://9to5mac.com/feed'; + link = 'https://9to5mac.com'; title += 'Mac'; description = 'Apple News & Mac Rumors Breaking All Day'; break; case 'google': - link = 'https://9to5google.com/feed'; + link = 'https://9to5google.com'; title += 'Google'; description = 'Google, Pixel news, Android, Home, Chrome OS, apps, more'; break; case 'toys': - link = 'https://9to5toys.com/feed'; + link = 'https://9to5toys.com'; title += 'Toys'; description = 'New Gear, reviews and deals'; break; @@ -30,6 +30,13 @@ module.exports = async (ctx) => { break; } + if (ctx.params.tag) { + link = `${link}/guides/${ctx.params.tag}/feed`; + title = `${ctx.params.tag} | ${title}`; + } else { + link = `${link}/feed`; + } + const feed = await parser.parseURL(link); const items = await Promise.all(