From d601617268a228505f02f5843b3fd11f946dd9b3 Mon Sep 17 00:00:00 2001 From: zhiyu1998 Date: Mon, 20 Mar 2023 00:57:16 +0800 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E6=96=B0=E5=A2=9E=E6=B3=A2?= =?UTF-8?q?=E7=82=B9=E9=9F=B3=E4=B9=90=E7=82=B9mv?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/neteasepro.js | 6 ++-- apps/query.js | 4 +-- apps/tools.js | 50 ++++++++++++++++++++++++++++++++-- config/help.yaml | 5 +++- config/version.yaml | 3 +- resources/img/icon/bodian.png | Bin 0 -> 2377 bytes 6 files changed, 59 insertions(+), 9 deletions(-) create mode 100644 resources/img/icon/bodian.png diff --git a/apps/neteasepro.js b/apps/neteasepro.js index a3f4fe4..2405539 100644 --- a/apps/neteasepro.js +++ b/apps/neteasepro.js @@ -31,16 +31,16 @@ export class neteasepro extends plugin { rule: [ { /** 命令正则匹配 */ - reg: "#网易云登录", + reg: "^#网易云登录$", /** 执行方法 */ fnc: "neteaseCloudLogin", }, { - reg: "#网易云每日推荐", + reg: "^#网易云每日推荐$", fnc: "neteaseDailyRecommend", }, { - reg: "#网易云听歌排行", + reg: "^#网易云听歌排行$", fnc: "neteaseListenRank", }, { diff --git a/apps/query.js b/apps/query.js index f60dfba..0841b94 100644 --- a/apps/query.js +++ b/apps/query.js @@ -33,11 +33,11 @@ export class query extends plugin { fnc: "cat", }, { - reg: "^#电脑软件推荐$" /** 执行方法 */, + reg: "^#电脑软件推荐$", fnc: "computerRecommended", }, { - reg: "^#安卓软件推荐$" /** 执行方法 */, + reg: "^#安卓软件推荐$", fnc: "androidRecommended", }, { diff --git a/apps/tools.js b/apps/tools.js index 0865dfc..fa9c31e 100644 --- a/apps/tools.js +++ b/apps/tools.js @@ -1,7 +1,7 @@ // 主库 import fetch from "node-fetch"; import fs from "node:fs"; -import { Gfs, segment } from "oicq"; +import { segment } from "oicq"; // 其他库 import md5 from "md5"; import axios from "axios"; @@ -65,6 +65,10 @@ export class tools extends plugin { fnc: "clearTrash", permission: "master", }, + { + reg: '^#波点音乐(.*)', + fnc: 'bodianMusic' + } ], }); // http://api.tuwei.space/girl @@ -638,6 +642,48 @@ export class tools extends plugin { } } + async bodianMusic(e) { + const msg = e.msg.replace("#波点音乐").trim() + const API = `https://xiaobai.klizi.cn/API/music/bodian.php?msg=${msg}&n=&max=` + // 获取列表 + const thisMethod = this; + await axios.get(API).then(resp => { + /** + * "songName": "山海", + * "artist": "草东没有派对", + * "coverUrl": "https://img3.kuwo.cn/wmvpic/324/78/55/3196258119.jpg", + * "highUrl": "http://other.player.nf03.sycdn.kuwo.cn/f7451ba7f02256b6b5d5ae8a74336502/64172260/resource/m2/55/56/3401786858.mp4?from=bodian", + * "lowUrl": "http://other.player.nf03.sycdn.kuwo.cn/47e753a5f8350140716e439f1c87dc1f/64172260/resource/m3/50/96/2318372432.mp4?from=bodian", + * "shortLowUrl": null + */ + e.reply("请选择一个要播放的视频：\n" + resp.data); + thisMethod.setContext("bodianMusicContext"); + }) + return true; + } + + /** + * @link bodianMusic 波点音乐上下文 + * @returns {Promise} + */ + async bodianMusicContext() { + // 当前消息 + const curMsg = this.e; + // 上一个消息 + const preMsg = await this.getContext().bodianMusicContext; + const msg = preMsg.msg.replace("#波点音乐", "").trim(); + const API = `https://xiaobai.klizi.cn/API/music/bodian.php?msg=${msg}&n=${Number(curMsg.msg)}&max=` + const thisMethod = this; + await axios.get(API).then(async res => { + const {songName, artist, coverUrl, highUrl, lowUrl, shortLowUrl} = res.data; + curMsg.reply([`${songName}-${artist}\n`, segment.image(coverUrl)]); + await thisMethod.downloadVideo(lowUrl).then(path => { + curMsg.reply(segment.video(path + "/temp.mp4")); + }) + thisMethod.finish("bodianMusicContext"); + }) + } + /** * 哔哩哔哩下载 * @param title @@ -791,7 +837,7 @@ export class tools extends plugin { res.data.pipe(writer); return new Promise((resolve, reject) => { - writer.on("finish", resolve); + writer.on("finish", () => resolve(groupPath)); writer.on("error", reject); }); } diff --git a/config/help.yaml b/config/help.yaml index 7575abc..25ca26d 100644 --- a/config/help.yaml +++ b/config/help.yaml @@ -56,8 +56,11 @@ - icon: netease title: "网易云音乐" desc: 网易云音乐解析 + - icon: bodian + title: "#波点音乐" + desc: 波点云音乐点MV - group: 其他指令 list: - icon: update title: "#R插件更新" - desc: "进行更新R插件" \ No newline at end of file + desc: "进行更新R插件" diff --git a/config/version.yaml b/config/version.yaml index 13ecd55..459a7a4 100644 --- a/config/version.yaml +++ b/config/version.yaml @@ -2,6 +2,7 @@ version: 1.1.0-rc0, data: [ + 新增#波点音乐MV点歌, 升级netease解析全面重构！, 适配bilibili小程序解析, 增加#搜书查询, @@ -9,4 +10,4 @@ 添加#R帮助获取插件帮助, 添加#R版本获取插件版本, ], -} \ No newline at end of file +} diff --git a/resources/img/icon/bodian.png b/resources/img/icon/bodian.png new file mode 100644 index 0000000000000000000000000000000000000000..ac3c09dd716f40e23482b6780634d029bdea4857 GIT binary patch literal 2377 zcmV-P3AXl$P)Px#^H5AwMNDaNzxJ{-{qs`%=pX#=;(};lRbiXZ+m!5=-Zv6qkF)hYQm|(#>GUVmT8-UMYXA$>cBwAzG&3Ek=U_K z)yHt@&x_2b_%ZE-0000ObW%=J0HfYWoA{&{C6#ihsMtx3ZM}Hl``XUq-MB~U000Nj zNkl@hOl7a--b!M7=FEq= zA7{?#=e)P7sHM|eTmRR;QOR$p7+mf!L+XdTc0($&n~P{B4>Lzc&t5$_b??-bQ)gcN zw(8uj8mWicLr}HjNMtgXIrh0H*SmMYD@Q!LqBswob*{GCSTCNw#*Zu(xM(YVPT@C|*E#gmNQBkomv zkBHQ~$z_h>EWK!xg>a_<*SMh~CIgTArH;4{(UYZm3dJMdO~H$Jm^nH6?s&mu@wl6t zJ8z<%sOqyDE^PGH>&@nq)MmYwc9R=D$Gh`-S}v>LHpItUZ(f!YUC}g6(aq({M(k#l z)#!K@Sa27AxpySA(;qy4sS{1_mx9vFmo*#jlv@l9&bzxyQ{X+gtNXL%bE#`3uC(Pw zvKAQ4<}NNM@Lu}M^0`z>K=sWH5D)C8T^GMnE*P?_zc9U|#pSvxS?a-baROfZpmg-s za6G50FA|PTcOih-B7CuRj^ghr{_`!kNm85U&Eq zBVLmN(S6}lxBgsxZm4Basxi>HQH(Npjz@tE$LtI1r8QslVXy3#I@j5W3ja_G-u1Nr zo&nol?bB+g5_siuj}=EDYvCgB5Rlzv?SM12OqDwB^I({F?NpZm!F^$E+5yW<4Rr>r zgmZ2{8bl5e8|%-W7%ZqxXfWJ!#_zgGf#|kp&r!Ccr0AZGqIHvq&1Rbgp)-=b2nPbF zabTl?u021V076H=hiD+qQSmqsIlza5%AdE7k4RjzOM%#ZAsj6A6>~vQteXMXr9kwI z6afs-J8`Mg90$TjvWTF)nT!^10(VVu-ERG703t`g7$C_xT6{2Glg-zrKt`vMFO#}lQGX8Zs~ zPXMv|0u1&HV>q8p;Imxc`NE3}gZ(aU8d&^qQY z;^>{p=X)I%6gYCijR=xc2Xm8KK^zZ)m)WQwd$8)8o>y;E9s?qGX8}|VM4!=3HM{)i z*|pL6Is#z0%=EGTlV4hw=;br=NOI#g(o@22IkAbeFvK&!24ILO57 zFklsYb!;?Hu%wKQ5b%=nIvo%cFS9sE+GbF!|`AfZsf#^$wJ!>XL1TfewMpJIGh#>yxX!kVIA;aGf zl~=!;9U0hwUp`hE|Mmr!zvF8QsGA~)J+yq7-0L24HucUlWDO#m1$uAZz>BzlcYagc z_sdA9w!S$hGVWcvQP5~7wgb2Sa;0&pvrX^5l8KO_0q zp{cEol;FYZH4;}WZhPR?VMTc4guHriJt3;aE>^Ga)9}Ibz&-zOxwCLQ?&YJ++!shq zJNOSL(9yjAu|g_+1I25?S9Sl$*=coRcqCx(ImSU&d{b>gFA??2`XzV-j8J*%Ym8L- z4t(R3#Eb21@6#V+kcjwX5$?_{{!-`f9o{~f?T6uqbSc>XNs00000NkvXXu0mjfpytWE literal 0 HcmV?d00001