Skip to content

Commit

Permalink
Merge pull request #637 from DIYgod/master
Browse files Browse the repository at this point in the history 
[pull] master from diygod:master
  • Loading branch information
@pull
pull[bot] authored Sep 21, 2022
2 parents f00f2d5 + 4cd0fb9 commit 36fd868
Show file tree
Hide file tree
Showing 17 changed files with 304 additions and 226 deletions.
26 changes: 13 additions & 13 deletions assets/radar-rules.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -384,19 +384,19 @@
{ title: '党建活动', docs: 'http://docs.rsshub.app/university.html#hu-bei-gong-ye-da-xue', source: '/djhd/djhd.htm', target: '/hbut/cs/djhd' },
],
},
'zcool.com.cn': {
_name: '站酷',
www: [
{ title: '发现', docs: 'https://docs.rsshub.app/design.html#zhan-ku', source: '', target: '/zcool/discover' },
{ title: '发现 - 精选 - 全部推荐', docs: 'https://docs.rsshub.app/design.html#zhan-ku', source: '', target: '/zcool/discover/all' },
{ title: '发现 - 精选 - 首页推荐', docs: 'https://docs.rsshub.app/design.html#zhan-ku', source: '', target: '/zcool/discover/home' },
{ title: '发现 - 精选 - 编辑精选', docs: 'https://docs.rsshub.app/design.html#zhan-ku', source: '', target: '/zcool/discover/home' },
{ title: '发现 - 精选 - 文章 - 编辑精选', docs: 'https://docs.rsshub.app/design.html#zhan-ku', source: '', target: '/zcool/discover/article' },
{ title: '作品榜单', docs: 'https://docs.rsshub.app/design.html#zhan-ku', source: '', target: '/zcool/top/design' },
{ title: '文章榜单', docs: 'https://docs.rsshub.app/design.html#zhan-ku', source: '', target: '/zcool/top/article' },
{ title: '用户作品', docs: 'https://docs.rsshub.app/design.html#zhan-ku', source: ['/u/:id'], target: '/zcool/user/:id' },
],
},
// 'zcool.com.cn': {
// _name: '站酷',
// www: [
// { title: '发现', docs: 'https://docs.rsshub.app/design.html#zhan-ku', source: '', target: '/zcool/discover' },
// { title: '发现 - 精选 - 全部推荐', docs: 'https://docs.rsshub.app/design.html#zhan-ku', source: '', target: '/zcool/discover/all' },
// { title: '发现 - 精选 - 首页推荐', docs: 'https://docs.rsshub.app/design.html#zhan-ku', source: '', target: '/zcool/discover/home' },
// { title: '发现 - 精选 - 编辑精选', docs: 'https://docs.rsshub.app/design.html#zhan-ku', source: '', target: '/zcool/discover/home' },
// { title: '发现 - 精选 - 文章 - 编辑精选', docs: 'https://docs.rsshub.app/design.html#zhan-ku', source: '', target: '/zcool/discover/article' },
// { title: '作品榜单', docs: 'https://docs.rsshub.app/design.html#zhan-ku', source: '', target: '/zcool/top/design' },
// { title: '文章榜单', docs: 'https://docs.rsshub.app/design.html#zhan-ku', source: '', target: '/zcool/top/article' },
// { title: '用户作品', docs: 'https://docs.rsshub.app/design.html#zhan-ku', source: ['/u/:id'], target: '/zcool/user/:id' },
// ],
// },
't.me': {
_name: 'Telegram',
'.': [
Expand Down
106 changes: 53 additions & 53 deletions lib/radar-rules.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1021,59 +1021,59 @@ module.exports = {
},
],
},
'zcool.com.cn': {
_name: '站酷',
www: [
{
title: '发现',
docs: 'https://docs.rsshub.app/design.html#zhan-ku',
source: '',
target: '/zcool/discover',
},
{
title: '发现 - 精选 - 全部推荐',
docs: 'https://docs.rsshub.app/design.html#zhan-ku',
source: '',
target: '/zcool/discover/all',
},
{
title: '发现 - 精选 - 首页推荐',
docs: 'https://docs.rsshub.app/design.html#zhan-ku',
source: '',
target: '/zcool/discover/home',
},
{
title: '发现 - 精选 - 编辑精选',
docs: 'https://docs.rsshub.app/design.html#zhan-ku',
source: '',
target: '/zcool/discover/home',
},
{
title: '发现 - 精选 - 文章 - 编辑精选',
docs: 'https://docs.rsshub.app/design.html#zhan-ku',
source: '',
target: '/zcool/discover/article',
},
{
title: '作品榜单',
docs: 'https://docs.rsshub.app/design.html#zhan-ku',
source: '',
target: '/zcool/top/design',
},
{
title: '文章榜单',
docs: 'https://docs.rsshub.app/design.html#zhan-ku',
source: '',
target: '/zcool/top/article',
},
{
title: '用户作品',
docs: 'https://docs.rsshub.app/design.html#zhan-ku',
source: ['/u/:id'],
target: `/zcool/user/:id`,
},
],
},
// 'zcool.com.cn': {
// _name: '站酷',
// www: [
// {
// title: '发现',
// docs: 'https://docs.rsshub.app/design.html#zhan-ku',
// source: '',
// target: '/zcool/discover',
// },
// {
// title: '发现 - 精选 - 全部推荐',
// docs: 'https://docs.rsshub.app/design.html#zhan-ku',
// source: '',
// target: '/zcool/discover/all',
// },
// {
// title: '发现 - 精选 - 首页推荐',
// docs: 'https://docs.rsshub.app/design.html#zhan-ku',
// source: '',
// target: '/zcool/discover/home',
// },
// {
// title: '发现 - 精选 - 编辑精选',
// docs: 'https://docs.rsshub.app/design.html#zhan-ku',
// source: '',
// target: '/zcool/discover/home',
// },
// {
// title: '发现 - 精选 - 文章 - 编辑精选',
// docs: 'https://docs.rsshub.app/design.html#zhan-ku',
// source: '',
// target: '/zcool/discover/article',
// },
// {
// title: '作品榜单',
// docs: 'https://docs.rsshub.app/design.html#zhan-ku',
// source: '',
// target: '/zcool/top/design',
// },
// {
// title: '文章榜单',
// docs: 'https://docs.rsshub.app/design.html#zhan-ku',
// source: '',
// target: '/zcool/top/article',
// },
// {
// title: '用户作品',
// docs: 'https://docs.rsshub.app/design.html#zhan-ku',
// source: ['/u/:id'],
// target: `/zcool/user/:id`,
// },
// ],
// },
'zhuixinfan.com': {
_name: '追新番日剧站',
'.': [
Expand Down
10 changes: 5 additions & 5 deletions lib/router.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1866,11 +1866,11 @@ router.get('/getitfree/search/:keyword?', lazyloadRouteHandler('./routes/getitfr
router.get('/10000link/news/:category?', lazyloadRouteHandler('./routes/10000link/news'));

// 站酷
router.get('/zcool/discover/:query?/:subCate?/:hasVideo?/:city?/:collage?/:recommendLevel?/:sort?', lazyloadRouteHandler('./routes/zcool/discover'));
router.get('/zcool/recommend/:query?/:subCate?/:hasVideo?/:city?/:collage?/:recommendLevel?/:sort?', lazyloadRouteHandler('./routes/zcool/discover')); // 兼容老版本
router.get('/zcool/top/:type', lazyloadRouteHandler('./routes/zcool/top'));
router.get('/zcool/top', lazyloadRouteHandler('./routes/zcool/top')); // 兼容老版本
router.get('/zcool/user/:uid', lazyloadRouteHandler('./routes/zcool/user'));
// router.get('/zcool/discover/:query?/:subCate?/:hasVideo?/:city?/:collage?/:recommendLevel?/:sort?', lazyloadRouteHandler('./routes/zcool/discover'));
// router.get('/zcool/recommend/:query?/:subCate?/:hasVideo?/:city?/:collage?/:recommendLevel?/:sort?', lazyloadRouteHandler('./routes/zcool/discover')); // 兼容老版本
// router.get('/zcool/top/:type', lazyloadRouteHandler('./routes/zcool/top'));
// router.get('/zcool/top', lazyloadRouteHandler('./routes/zcool/top')); // 兼容老版本
// router.get('/zcool/user/:uid', lazyloadRouteHandler('./routes/zcool/user'));

// 第一财经
// router.get('/yicai/brief', lazyloadRouteHandler('./routes/yicai/brief.js'));
Expand Down
75 changes: 0 additions & 75 deletions lib/routes/zcool/top.js
View file

This file was deleted.

58 changes: 0 additions & 58 deletions lib/routes/zcool/user.js
View file

This file was deleted.

Loading

1 comment on commit 36fd868

@vercel
Copy link

@vercel vercel bot commented on 36fd868 Sep 21, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

rsshub – ./

rsshub-git-master-narcissu.vercel.app
rsshub-narcissu.vercel.app
rsshub.tari.xyz

Please sign in to comment.