diff --git a/docs/multimedia.md b/docs/multimedia.md index d197e9045c..25bd0ad4e5 100644 --- a/docs/multimedia.md +++ b/docs/multimedia.md @@ -520,69 +520,113 @@ BT 之家的域名会变更,本路由以 为默认 JavBus 有多个备用域名,本路由默认使用永久域名 ,若该域名无法访问,可以通过在路由最后加上 `?domain=<域名>` 指定路由访问的域名。如指定备用域名为 ,则在所有 JavBus 路由最后加上 `?domain=javsee.icu` 即可,此时路由为 [`/javbus?domain=javsee.icu`](https://rsshub.app/javbus?domain=javsee.icu) -值得注意的是 **欧陆风云** 的域名与主域名有所不同,其备用域名亦然,本路由默认使用域名 ,若该域名无法访问,可以通过在路由最后加上 `?western_domain=<域名>` 指定路由访问的域名。如指定备用域名为 ,则在所有 JavBus **欧陆风云** 路由最后加上 `?western_domain=javsee.one` 即可,此时路由为 [`/javbus/western?western_domain=javsee.one`](https://rsshub.app/javbus/western?western_domain=javsee.one) +值得注意的是 **欧美** 的域名与主域名有所不同,其备用域名亦然,本路由默认使用域名 ,若该域名无法访问,可以通过在路由最后加上 `?western_domain=<域名>` 指定路由访问的域名。如指定备用域名为 ,则在所有 JavBus **欧美** 路由最后加上 `?western_domain=javsee.one` 即可,此时路由为 [`/javbus/western?western_domain=javsee.one`](https://rsshub.app/javbus/western?western_domain=javsee.one) ::: -### 首页 +### 有码 - 首页 -### 分类 +### 有码 - 分类 - + -### 演员 +更多分类前往 [有碼類別 - 影片](https://www.javbus.com/genre) - + -### 系列 +### 有码 - 演员 - + -### 制作商 +更多演员前往 [有碼女優 - 影片](https://www.javbus.com/actresses) - + -### 发行商 +### 有码 - 系列 - + -### 导演 +### 有码 - 制作商 - + -### 首页 / 步兵 +### 有码 - 发行商 - + -### 分类 / 步兵 +### 有码 - 导演 - + -### 演员 / 步兵 +### 有码 - 搜索 - + -### 系列 / 步兵 +### 无码 - 首页 - + -### 首页 / 欧陆风云 +### 无码 - 分类 - + -### 分类 / 欧陆风云 +更多分类前往 [無碼類別 - 影片](https://www.javbus.com/uncensored/genre) - + -### 演员 / 欧陆风云 +### 无码 - 演员 - + -### 系列 / 欧陆风云 +更多演员前往 [無碼女優 - 影片](https://www.javbus.com/uncensored/actresses) - + + +### 无码 - 系列 + + + +### 无码 - 制作商 + + + +### 无码 - 搜索 + + + +### 欧美 - 首页 + + + +### 欧美 - 分类 + + + +更多分类前往 [類別 - 影片](https://www.javbus.org/genre) + + + +### 欧美 - 演员 + + + +更多演员前往 [歐美演員 - 影片](https://www.javbus.org/actresses) + + + +### 欧美 - 系列 + + + +### 欧美 - 制作商 + + + +### 欧美 - 搜索 + + ## JavDB diff --git a/lib/v2/javbus/index.js b/lib/v2/javbus/index.js index 82111f28db..48f00278cc 100644 --- a/lib/v2/javbus/index.js +++ b/lib/v2/javbus/index.js @@ -8,7 +8,7 @@ module.exports = async (ctx) => { const isWestern = /^\/western/.test(ctx.path); const rootUrl = `https://www.${ctx.query.domain ?? 'javbus.com'}`; - const westernUrl = `https://www.${ctx.query.western_domain ?? 'javbus.red'}`; + const westernUrl = `https://www.${ctx.query.western_domain ?? 'javbus.org'}`; const currentUrl = `${isWestern ? westernUrl : rootUrl}${ctx.path.replace(/^\/western/, '').replace(/\/home/, '')}`; const response = await got({ @@ -149,5 +149,6 @@ module.exports = async (ctx) => { title: `${/^JavBus/.test(title) ? '' : 'JavBus - '}${title.replace(/ - AV磁力連結分享/, '')}`, link: currentUrl, item: items, + allowEmpty: true, }; }; diff --git a/lib/v2/javbus/maintainer.js b/lib/v2/javbus/maintainer.js index a688024137..8378c32861 100644 --- a/lib/v2/javbus/maintainer.js +++ b/lib/v2/javbus/maintainer.js @@ -1,18 +1,19 @@ module.exports = { '/': ['MegrezZhu', 'CoderTonyChan', 'nczitzk'], - '/genre/:gid': ['MegrezZhu', 'CoderTonyChan'], - '/home': ['MegrezZhu', 'CoderTonyChan'], - '/label/:labelid': ['MegrezZhu', 'CoderTonyChan', 'Felix2yu'], - '/series/:seriesid': ['MegrezZhu', 'CoderTonyChan', 'Felix2yu'], - '/star/:sid': ['MegrezZhu', 'CoderTonyChan'], - '/studio/:studioid': ['MegrezZhu', 'CoderTonyChan', 'Felix2yu'], - '/uncensored/home': ['MegrezZhu', 'CoderTonyChan'], - '/uncensored/genre/:gid': ['MegrezZhu', 'CoderTonyChan'], - '/uncensored/series/:seriesid': ['MegrezZhu', 'CoderTonyChan', 'Felix2yu'], - '/uncensored/star/:sid': ['MegrezZhu', 'CoderTonyChan'], + '/genre/:id': ['MegrezZhu', 'CoderTonyChan', 'nczitzk'], + '/label/:id': ['MegrezZhu', 'CoderTonyChan', 'Felix2yu', 'nczitzk'], + '/series/:id': ['MegrezZhu', 'CoderTonyChan', 'Felix2yu', 'nczitzk'], + '/star/:id': ['MegrezZhu', 'CoderTonyChan', 'nczitzk'], + '/studio/:id': ['MegrezZhu', 'CoderTonyChan', 'Felix2yu', 'nczitzk'], + '/search/:keyword': ['nczitzk'], + '/uncensored': ['MegrezZhu', 'CoderTonyChan', 'nczitzk'], + '/uncensored/genre/:id': ['MegrezZhu', 'CoderTonyChan', 'nczitzk'], + '/uncensored/series/:id': ['MegrezZhu', 'CoderTonyChan', 'Felix2yu', 'nczitzk'], + '/uncensored/star/:id': ['MegrezZhu', 'CoderTonyChan', 'nczitzk'], + '/uncensored/search/:keyword': ['nczitzk'], '/western': ['MegrezZhu', 'CoderTonyChan', 'nczitzk'], - '/western/home': ['MegrezZhu', 'CoderTonyChan'], - '/western/genre/:gid': ['MegrezZhu', 'CoderTonyChan'], - '/western/series/:seriesid': ['MegrezZhu', 'CoderTonyChan', 'Felix2yu'], - '/western/star/:sid': ['MegrezZhu', 'CoderTonyChan'], + '/western/genre/:gid': ['MegrezZhu', 'CoderTonyChan', 'nczitzk'], + '/western/series/:seriesid': ['MegrezZhu', 'CoderTonyChan', 'Felix2yu', 'nczitzk'], + '/western/star/:sid': ['MegrezZhu', 'CoderTonyChan', 'nczitzk'], + '/western/search/:keyword': ['nczitzk'], }; diff --git a/lib/v2/javbus/radar.js b/lib/v2/javbus/radar.js index d1f7178b6a..05c7c1ced6 100644 --- a/lib/v2/javbus/radar.js +++ b/lib/v2/javbus/radar.js @@ -2,64 +2,88 @@ const javbus = { _name: 'JavBus', www: [ { - title: '首页', + title: '有码 - 首页', docs: 'https://docs.rsshub.app/multimedia.html#javbus', source: '/', - target: '/javbus/home', + target: '/javbus', }, { - title: '分类', + title: '有码 - 分类', docs: 'https://docs.rsshub.app/multimedia.html#javbus', - source: '/genre/:gid', - target: '/javbus/genre/:gid', + source: '/genre/:id', + target: '/javbus/genre/:id', }, { - title: '演员', + title: '有码 - 演员', docs: 'https://docs.rsshub.app/multimedia.html#javbus', - source: '/star/:sid', - target: '/javbus/star/:sid', + source: '/star/:id', + target: '/javbus/star/:id', }, { - title: '系列', + title: '有码 - 系列', docs: 'https://docs.rsshub.app/multimedia.html#javbus', - source: '/series/:seriesid', - target: '/javbus/series/:seriesid', + source: '/series/:id', + target: '/javbus/series/:id', }, { - title: '制作商', + title: '有码 - 制作商', docs: 'https://docs.rsshub.app/multimedia.html#javbus', - source: '/studio/:studioid', - target: '/javbus/studio/:studioid', + source: '/studio/:id', + target: '/javbus/studio/:id', }, { - title: '发行商', + title: '有码 - 发行商', docs: 'https://docs.rsshub.app/multimedia.html#javbus', - source: '/label/:labelid', - target: '/javbus/label/:labelid', + source: '/label/:id', + target: '/javbus/label/:id', }, { - title: '首页 / 步兵', + title: '有码 - 导演', + docs: 'https://docs.rsshub.app/multimedia.html#javbus', + source: '/director/:id', + target: '/javbus/director/:id', + }, + { + title: '有码 - 搜索', + docs: 'https://docs.rsshub.app/multimedia.html#javbus', + source: '/search/:keyword', + target: '/javbus/search/:keyword', + }, + { + title: '无码 - 首页', docs: 'https://docs.rsshub.app/multimedia.html#javbus', source: '/uncensored', - target: '/javbus/uncensored/home', + target: '/javbus/uncensored', }, { - title: '分类 / 步兵', + title: '无码 - 分类', docs: 'https://docs.rsshub.app/multimedia.html#javbus', - source: '/uncensored/genre/:gid', - target: '/javbus/uncensored/genre/:gid', + source: '/uncensored/genre/:id', + target: '/javbus/uncensored/genre/:id', }, { - title: '演员 / 步兵', + title: '无码 - 演员', docs: 'https://docs.rsshub.app/multimedia.html#javbus', - source: '/uncensored/star/:sid', - target: '/javbus/uncensored/star/:sid', + source: '/uncensored/star/:id', + target: '/javbus/uncensored/star/:id', }, { - title: '系列 / 步兵', + title: '无码 - 系列', docs: 'https://docs.rsshub.app/multimedia.html#javbus', - source: '/uncensored/series/:seriesid', - target: '/javbus/uncensored/series/:seriesid', + source: '/uncensored/series/:id', + target: '/javbus/uncensored/series/:id', + }, + { + title: '无码 - 制作商', + docs: 'https://docs.rsshub.app/multimedia.html#javbus', + source: '/uncensored/studio/:id', + target: '/javbus/uncensored/studio/:id', + }, + { + title: '无码 - 搜索', + docs: 'https://docs.rsshub.app/multimedia.html#javbus', + source: '/uncensored/search/:keyword', + target: '/javbus/uncensored/search/:keyword', }, ], }; @@ -68,28 +92,40 @@ const westernJavbus = { _name: 'JavBus', www: [ { - title: '首页 / 欧陆风云', + title: '欧美 - 首页', docs: 'https://docs.rsshub.app/multimedia.html#javbus', source: '/', - target: '/javbus/western/home', + target: '/javbus/western', }, { - title: '分类 / 欧陆风云', + title: '欧美 - 分类', docs: 'https://docs.rsshub.app/multimedia.html#javbus', - source: '/genre/:gid', - target: '/javbus/western/genre/:gid', + source: '/genre/:id', + target: '/javbus/western/genre/:id', }, { - title: '演员 / 欧陆风云', + title: '欧美 - 演员', docs: 'https://docs.rsshub.app/multimedia.html#javbus', - source: '/star/:sid', - target: '/javbus/western/star/:sid', + source: '/star/:id', + target: '/javbus/western/star/:id', }, { - title: '系列 / 欧陆风云', + title: '欧美 - 系列', docs: 'https://docs.rsshub.app/multimedia.html#javbus', - source: '/series/:seriesid', - target: '/javbus/western/series/:seriesid', + source: '/series/:id', + target: '/javbus/western/series/:id', + }, + { + title: '欧美 - 制作商', + docs: 'https://docs.rsshub.app/multimedia.html#javbus', + source: '/studio/:id', + target: '/javbus/western/studio/:id', + }, + { + title: '欧美 - 搜索', + docs: 'https://docs.rsshub.app/multimedia.html#javbus', + source: '/search/:keyword', + target: '/javbus/western/search/:keyword', }, ], }; diff --git a/lib/v2/javbus/router.js b/lib/v2/javbus/router.js index b6fa53b922..98d6436ba6 100644 --- a/lib/v2/javbus/router.js +++ b/lib/v2/javbus/router.js @@ -1,3 +1,3 @@ module.exports = (router) => { - router.get(/([\w\d/-]+)?/, require('./index')); + router.get(/([\w/-]+)?/, require('./index')); };