Merge pull request #600 from DIYgod/master

[pull] master from diygod:master

Author: pull[bot]

docs/live.md

@@ -50,11 +50,11 @@ pageClass: routes
 
 <Route author="SettingDust xyqfer" example="/huya/live/edmunddzhang" path="/huya/live/:id" :paramsDesc="['直播间id或主播名(有一些id是名字，如上)']" radar="1" rssbud="1"/>
 
-## 浪 Play (原 kingkong) 直播
+## 浪 Play 直播
 
 ### 直播间开播
 
-<Route author="MittWillson" example="/langlive/room/666666" path="/langlive/room/:id" :paramsDesc="['直播间 id, 可在主播直播间页 URL 中找到']"/>
+<Route author="MittWillson" example="/lang/live/room/1352360" path="/lang/live/room/:id" :paramsDesc="['直播间 id, 可在主播直播间页 URL 中找到']"/>
 
 ## 猎趣 TV
 

lib/router.js

@@ -194,8 +194,8 @@ router.get('/dribbble/keyword/:keyword', lazyloadRouteHandler('./routes/dribbble
 router.get('/huya/live/:id', lazyloadRouteHandler('./routes/huya/live'));
 
 // 浪Play(原kingkong)直播
-router.get('/kingkong/room/:id', lazyloadRouteHandler('./routes/langlive/room'));
-router.get('/langlive/room/:id', lazyloadRouteHandler('./routes/langlive/room'));
+// router.get('/kingkong/room/:id', lazyloadRouteHandler('./routes/langlive/room'));
+// router.get('/langlive/room/:id', lazyloadRouteHandler('./routes/langlive/room'));
 
 // SHOWROOM直播
 router.get('/showroom/room/:id', lazyloadRouteHandler('./routes/showroom/room'));

lib/routes/langlive/room.js

@@ -4,6 +4,11 @@ const { parseDate } = require('@/utils/parse-date');
 const { art } = require('@/utils/render');
 const path = require('path');
 
+const toSize = (raw) => {
+    const matches = raw.match(/(\d+(\.\d+)?)(\w+)/);
+    return matches[3] === 'GB' ? matches[1] * 1024 : matches[1];
+};
+
 module.exports = async (ctx) => {
     const isWestern = /^\/western/.test(ctx.path);
 
@@ -19,7 +24,7 @@ module.exports = async (ctx) => {
     const $ = cheerio.load(response.data);
 
     let items = $('.movie-box')
-        .slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 30)
+        .slice(0, ctx.query.limit ? parseInt(ctx.query.limit) : 50)
         .toArray()
         .map((item) => {
             item = $(item);
@@ -98,11 +103,12 @@ module.exports = async (ctx) => {
                                 link: td.first().attr('href'),
                                 size: td.eq(1).text().trim(),
                                 date: td.last().text().trim(),
+                                score: content(tr).find('a').length ** 8 * toSize(td.eq(1).text().trim()),
                             };
                         });
 
                     if (magnets) {
-                        item.enclosure_url = magnets[0].link;
+                        item.enclosure_url = magnets.sort((a, b) => b.score - a.score)[0].link;
                         item.enclosure_type = 'application/x-bittorrent';
                     }
                 } catch (e) {

lib/v2/javbus/index.js

@@ -9,9 +9,20 @@
 {{/if}}
 <br>
 <h4>磁力連結投稿</h4>
+<table>
+<tr>
+<th>磁力名稱</th>
+<th>檔案大小</th>
+<th>分享日期</th>
+</tr>
 {{each magnets magnet}}
-<li><a href="{{ magnet.link }}">{{ magnet.title }} [{{ magnet.size }}] ({{ magnet.date }})</a></li>
+<tr>
+<td><a href="{{ magnet.link }}">{{ magnet.title }}</a></td>
+<td>{{ magnet.size }}</td>
+<td>{{ magnet.date }}</td>
+</tr>
 {{/each}}
+</table>
 <h4>樣品圖像</h4>
 {{each thumbs}}
 <img src="{{ $value }}">

lib/v2/javbus/templates/description.art

@@ -0,0 +1,3 @@
+module.exports = {
+    '/live/room/:id': ['MittWillson'],
+};

lib/v2/lang/maintainer.js

@@ -0,0 +1,13 @@
+module.exports = {
+    'lang.live': {
+        _name: '浪 Play 直播',
+        '.': [
+            {
+                title: '直播间开播',
+                docs: 'https://docs.rsshub.app/live.html#lang-play-yuan-zhi-bo',
+                source: ['/room/:id'],
+                target: '/lang/live/room/:id',
+            },
+        ],
+    },
+};

lib/v2/lang/radar.js

@@ -0,0 +1,40 @@
+const got = require('@/utils/got');
+const { art } = require('@/utils/render');
+const path = require('path');
+
+module.exports = async (ctx) => {
+    const id = ctx.params.id;
+    const url = `https://www.lang.live/room/${id}`;
+
+    const api = 'https://api.lang.live/langweb/v1/room/liveinfo';
+    const {
+        data: { data },
+    } = await got(api, {
+        searchParams: {
+            room_id: id,
+        },
+    });
+
+    let item = [];
+    const name = data.live_info.nickname;
+    if (data.live_info.live_status === 1) {
+        item = [
+            {
+                title: `${name} 开播了`,
+                link: url,
+                guid: `lang:live:room:${id}:${data.live_info.live_id}`,
+                description: art(path.join(__dirname, 'templates/room.art'), {
+                    live_info: data.live_info,
+                }),
+            },
+        ];
+    }
+
+    ctx.state.data = {
+        title: `${name} 的浪 Play 直播`,
+        description: data.live_info.sign,
+        link: url,
+        item,
+        allowEmpty: true,
+    };
+};

lib/v2/lang/room.js

@@ -0,0 +1,3 @@
+module.exports = (router) => {
+    router.get('/live/room/:id', require('./room'));
+};

lib/v2/lang/router.js

@@ -0,0 +1 @@
+<img src="{{ live_info.headimg }}">