From b33edd528397a9de0be3e8d70e64516707074c15 Mon Sep 17 00:00:00 2001 From: qixingchen Date: Mon, 14 May 2018 22:15:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3B=E7=AB=99=E7=9B=B4=E6=92=AD?= =?UTF-8?q?=E6=B8=B8=E6=88=8F/=E6=89=8B=E6=B8=B8=E5=88=86=E5=8C=BA?= =?UTF-8?q?=E8=AE=A2=E9=98=85=E5=A4=B1=E8=B4=A5=20(#125)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix bilibili-live game area not work * remove log --- routes/bilibili/liveArea.js | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-) diff --git a/routes/bilibili/liveArea.js b/routes/bilibili/liveArea.js index ecb4c7fe5..759172c44 100644 --- a/routes/bilibili/liveArea.js +++ b/routes/bilibili/liveArea.js @@ -1,6 +1,4 @@ const axios = require('axios'); -const art = require('art-template'); -const path = require('path'); const config = require('../../config'); module.exports = async (ctx) => { @@ -17,7 +15,6 @@ module.exports = async (ctx) => { break; } - const nameResponse = await axios({ method: 'get', url: `https://api.live.bilibili.com/room/v1/Area/getList`, @@ -30,6 +27,7 @@ module.exports = async (ctx) => { let parentTitle = ""; let parentID = ""; let areaTitle = ""; + let areaLink = ""; for (parentArea of nameResponse.data.data) { @@ -39,23 +37,35 @@ module.exports = async (ctx) => { parentID = parentArea.id; areaTitle = area.name; cateID = area.cate_id; + switch (parentID) { + case 1: + areaLink = `https://live.bilibili.com/pages/area/ent-all#${area.cate_id}/${areaID}`; + break; + case 2: + case 3: + areaLink = `https://live.bilibili.com/p/eden/area-tags#/${parentID}/${areaID}`; + break; + case 4: + areaLink = "https://live.bilibili.com/pages/area/draw"; + break; + } } } } const response = await axios({ method: 'get', - url: `https://api.live.bilibili.com/room/v1/AmuseArea/getThirdPageData?area_id=${areaID}&sort_type=${order}&page_size=30&scrollTid=0&page_no=1`, + url: `https://api.live.bilibili.com/room/v1/area/getRoomList?area_id=${areaID}&sort_type=${order}&page_size=30&page_no=1`, headers: { 'User-Agent': config.ua, - 'Referer': `https://live.bilibili.com/pages/area/ent-all` + 'Referer': `https://live.bilibili.com/p/eden/area-tags` } }); - const data = response.data.data.room_list; + const data = response.data.data; ctx.state.data = { title: `哔哩哔哩直播-${parentTitle}·${areaTitle}分区-${orderTitle}`, - link: `https://live.bilibili.com/pages/area/ent-all#${parentID}/${areaID}`, + link: `${areaLink}`, description: `哔哩哔哩直播-${parentTitle}·${areaTitle}分区-${orderTitle}`, lastBuildDate: new Date().toUTCString(), item: data.map((item) => ({