From 086b06f62cb13b65ee0cc48f6d42e668762ea6c3 Mon Sep 17 00:00:00 2001 From: ClovertaTheTrilobita Date: Tue, 14 Jan 2025 23:42:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9F=B3=E4=B9=90?= =?UTF-8?q?=E6=A3=80=E7=B4=A2=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=8A=9B?= =?UTF-8?q?=E5=87=BA=E8=87=AA=E5=AE=9A=E4=B9=89=E5=BC=82=E5=B8=B8bug=20?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements.txt | 16 +++++++++------- src/music/cloud_music/cloud_music.py | 4 +++- src/qq_plugins/cloudMusic.py | 4 ++-- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index ce8e51e..007f7ec 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,17 +6,19 @@ nonebot2[websockets] sqlalchemy~=2.0.34 autopep8 -graiax-silkcoder -Crypto +graiax-silkcoder[ffmpeg] +Crypto~=1.4.1 fake_useragent -pycryptodome -PyExecJS +pycryptodome~=3.21.0 +PyExecJS~=1.5.1 gradio_client -requests~=2.32.3 -pillow~=10.4.0 +requests~=2.31.0 +pillow~=11.1.0 yaml~=0.2.5 -pyyaml~=6.0.1 \ No newline at end of file +pyyaml~=6.0.1 +qrcode~=7.4.2 +nonebot~=1.9.1 \ No newline at end of file diff --git a/src/music/cloud_music/cloud_music.py b/src/music/cloud_music/cloud_music.py index da22aec..a8933ed 100644 --- a/src/music/cloud_music/cloud_music.py +++ b/src/music/cloud_music/cloud_music.py @@ -151,7 +151,7 @@ def netease_music_search(keyword,session): params = { "s": keyword, "type": 1, # 1 表示搜索歌曲，2 表示搜索专辑，3 表示搜索歌手等 - "limit": 50, # 限制搜索结果的数量 + "limit": 10, # 限制搜索结果的数量 "offset": 0, # 搜索结果的偏移量，可用于分页 "sub": "false", } @@ -162,6 +162,8 @@ def netease_music_search(keyword,session): if songs: filtered_data = [item for item in songs if item.get('fee') == 8]# 过滤掉付费歌曲 num = 0 + if len(filtered_data) - 1 <= 0: + return None, None, None, None num = Random().randint(0, len(filtered_data) - 1) first_song = filtered_data[num] # 获取第一首歌曲 song_name = first_song["name"] diff --git a/src/qq_plugins/cloudMusic.py b/src/qq_plugins/cloudMusic.py index 43347a6..c36c0fb 100644 --- a/src/qq_plugins/cloudMusic.py +++ b/src/qq_plugins/cloudMusic.py @@ -15,9 +15,9 @@ async def handle_function(msg: MessageEvent): #搜索歌曲 song_id,song_name,singer,song_url = netease_music_search(keyword,session) if song_id is None: - await music.finish("没有找到歌曲") + await music.finish("\n没有找到歌曲，或检索到的歌曲均为付费喔qwq\n这绝对不是我的错，绝对不是！") else: - await music.send(MessageSegment.text(f" 来源：网易云音乐\n歌曲：{song_name} - {singer}")) + await music.send(MessageSegment.text(f" 来源：网易云音乐\n歌曲：{song_name} - {singer}\n请稍等喔🎵\n\n注意：PC端QQ可能会出现无法播放情况，建议使用移动端")) #返回转换后的歌曲路径 output_silk_path = netease_music_download(song_id, song_name, singer,session) await music.send(MessageSegment.file_audio(Path(output_silk_path))) From eb16a2f1b289e5254cd78a14981d8360e60022cd Mon Sep 17 00:00:00 2001 From: ClovertaTheTrilobita Date: Tue, 14 Jan 2025 23:50:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=9F=B3=E4=B9=90?= =?UTF-8?q?=E6=A3=80=E7=B4=A2=E6=97=A0=E6=B3=95=E6=AD=A3=E5=B8=B8=E6=8A=9B?= =?UTF-8?q?=E5=87=BA=E8=87=AA=E5=AE=9A=E4=B9=89=E5=BC=82=E5=B8=B8bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/music/cloud_music/cloud_music.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/music/cloud_music/cloud_music.py b/src/music/cloud_music/cloud_music.py index a8933ed..b8e278f 100644 --- a/src/music/cloud_music/cloud_music.py +++ b/src/music/cloud_music/cloud_music.py @@ -162,7 +162,7 @@ def netease_music_search(keyword,session): if songs: filtered_data = [item for item in songs if item.get('fee') == 8]# 过滤掉付费歌曲 num = 0 - if len(filtered_data) - 1 <= 0: + if len(filtered_data) - 1 <= 0: # 判断返回内容是否为空 return None, None, None, None num = Random().randint(0, len(filtered_data) - 1) first_song = filtered_data[num] # 获取第一首歌曲