From cc2af33f51fdb8b741b3fb83fe9dc5d8740da60b Mon Sep 17 00:00:00 2001 From: DIYgod Date: Sun, 6 May 2018 20:46:24 +0800 Subject: [PATCH] bilibili video replay: avid -> aid; use template module --- docs/README.md | 6 +++--- router.js | 2 +- routes/bilibili/{videoReply.js => reply.js} | 20 +++++++++----------- 3 files changed, 13 insertions(+), 15 deletions(-) rename routes/bilibili/{videoReply.js => reply.js} (67%) diff --git a/docs/README.md b/docs/README.md index ed5283b5b..0e6a9e7c5 100644 --- a/docs/README.md +++ b/docs/README.md @@ -154,11 +154,11 @@ s ### 视频评论 -举例: https://rss.now.sh/bilibili/video/reply/7 +举例: https://rss.now.sh/bilibili/video/reply/21669336 -路由: `/bilibili/video/reply/:avid` +路由: `/bilibili/video/reply/:aid` -参数: avid,视频 AV 号(仅数字) +参数: aid,可在视频页 URL 中找到 ## 微博 diff --git a/router.js b/router.js index 7db416ce4..f93d48525 100644 --- a/router.js +++ b/router.js @@ -19,7 +19,7 @@ router.get('/bilibili/user/followers/:uid', require('./routes/bilibili/followers router.get('/bilibili/user/followings/:uid', require('./routes/bilibili/followings')); router.get('/bilibili/partion/:tid', require('./routes/bilibili/partion')); router.get('/bilibili/bangumi/:seasonid', require('./routes/bilibili/bangumi')); -router.get('/bilibili/video/reply/:avid', require('./routes/bilibili/videoReply')); +router.get('/bilibili/video/reply/:aid', require('./routes/bilibili/reply')); // // 微博 router.get('/weibo/user/:uid', require('./routes/weibo/user')); diff --git a/routes/bilibili/videoReply.js b/routes/bilibili/reply.js similarity index 67% rename from routes/bilibili/videoReply.js rename to routes/bilibili/reply.js index 7ef076a6a..16759d2c1 100644 --- a/routes/bilibili/videoReply.js +++ b/routes/bilibili/reply.js @@ -1,16 +1,15 @@ const axios = require('axios'); -const art = require('art-template'); -const path = require('path'); +const template = require('../../utils/template'); const config = require('../../config'); const cheerio = require('cheerio'); const iconv = require('iconv-lite'); module.exports = async (ctx) => { - const avid = ctx.params.avid; + const aid = ctx.params.aid; const nameResponse = await axios({ method: 'get', - url: `https://www.bilibili.com/video/av${avid}`, + url: `https://www.bilibili.com/video/av${aid}`, headers: { 'User-Agent': config.ua, }, @@ -23,25 +22,24 @@ module.exports = async (ctx) => { const response = await axios({ method: 'get', - url: `https://api.bilibili.com/x/v2/reply?type=1&oid=${avid}&sort=0`, + url: `https://api.bilibili.com/x/v2/reply?type=1&oid=${aid}&sort=0`, headers: { 'User-Agent': config.ua, - 'Referer': `https://www.bilibili.com/video/av${avid}`, + 'Referer': `https://www.bilibili.com/video/av${aid}`, } }); const data = response.data.data.replies; - ctx.body = art(path.resolve(__dirname, '../../views/rss.art'), { + ctx.body = template({ title: `${name} 的 评论`, - link: `https://www.bilibili.com/video/av${avid}`, - description: `${name} 的 评论`, - lastBuildDate: new Date().toUTCString(), + link: `https://www.bilibili.com/video/av${aid}`, + description: `${name} 的评论`, item: data.map((item) => ({ title: `${item.member.uname} : ${item.content.message}`, description: `#${item.floor}
${item.member.uname} : ${item.content.message}`, pubDate: new Date(item.ctime * 1000).toUTCString(), - link: `https://www.bilibili.com/video/av${avid}/#reply${item.rpid}` + link: `https://www.bilibili.com/video/av${aid}/#reply${item.rpid}` })), }); }; \ No newline at end of file