diff --git a/lib/v2/hupu/all.js b/lib/v2/hupu/all.js index 5f47020962..6e2411db3c 100644 --- a/lib/v2/hupu/all.js +++ b/lib/v2/hupu/all.js @@ -43,18 +43,18 @@ module.exports = async (ctx) => { const videos = []; - content('.thread-video-wrap').each(function () { - videos.push(content('video').attr('src')); - content(this).remove(); + content('.hupu-post-video').each(function () { + videos.push({ + source: content(this).attr('src'), + poster: content(this).attr('poster'), + }); }); - content('.bbs-user-info-time span').remove(); - - item.author = content('.bbs-user-info-name').first().text(); - item.pubDate = item.pubDate ?? timezone(parseRelativeDate(content('.bbs-user-info-time').first().text()), +8); + item.author = content('.bbs-user-wrapper-content-name-span').first().text(); + item.pubDate = item.pubDate ?? timezone(parseRelativeDate(content('.second-line-user-info').first().text()), +8); item.description = art(path.join(__dirname, 'templates/description.art'), { videos, - description: content('.bbs-thread-content').html(), + description: content('.bbs-content').first().html(), }); } catch (e) { // no-empty diff --git a/lib/v2/hupu/bbs.js b/lib/v2/hupu/bbs.js index 929c048131..50483927ca 100644 --- a/lib/v2/hupu/bbs.js +++ b/lib/v2/hupu/bbs.js @@ -60,7 +60,7 @@ module.exports = async (ctx) => { const result = detailResponse.data.result; - item.description = art(path.join(__dirname, 'templates/description.art'), { + item.description = art(path.join(__dirname, 'templates/match.art'), { image: result.img, description: result.beginContent, keyEvent: result.keyEvent, diff --git a/lib/v2/hupu/templates/description.art b/lib/v2/hupu/templates/description.art index 3d417ad52c..f019c06259 100644 --- a/lib/v2/hupu/templates/description.art +++ b/lib/v2/hupu/templates/description.art @@ -1,22 +1,11 @@ -{{ if image }} - +{{ if videos }} +{{ each videos video }} + +{{ /each }} {{ /if }} {{ if description }} -

{{ description }}

-{{ /if }} - -{{ if keyEvent }} -

关键事件

-{{ each keyEvent event }} -

{{ event.title }}

-{{ each event.gifImgs gif }} - -{{ /each }} -{{ /each }} -{{ /if }} - -{{ if playerImage }} -

球员评分

- +{{@ description }} {{ /if }} \ No newline at end of file diff --git a/lib/v2/hupu/templates/match.art b/lib/v2/hupu/templates/match.art new file mode 100644 index 0000000000..3d417ad52c --- /dev/null +++ b/lib/v2/hupu/templates/match.art @@ -0,0 +1,22 @@ +{{ if image }} + +{{ /if }} + +{{ if description }} +

{{ description }}

+{{ /if }} + +{{ if keyEvent }} +

关键事件

+{{ each keyEvent event }} +

{{ event.title }}

+{{ each event.gifImgs gif }} + +{{ /each }} +{{ /each }} +{{ /if }} + +{{ if playerImage }} +

球员评分

+ +{{ /if }} \ No newline at end of file