From e0b46409f9b0287fb139a863589edfd293cd9eca Mon Sep 17 00:00:00 2001 From: Cynthia Foxwell Date: Mon, 23 Jan 2023 18:13:11 -0700 Subject: [PATCH 1/2] music: large url fixes --- src/modules/music.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/music.js b/src/modules/music.js index 531d0c8..d0f519e 100644 --- a/src/modules/music.js +++ b/src/modules/music.js @@ -290,7 +290,7 @@ async function enqueue({ fields: [ { name: "Title", - value: title && title != url ? `[${title}](${url})` : url, + value: (title && title != url ? `[${title}](${url})` : url).substring(0, 1024), inline: true, }, { @@ -336,7 +336,7 @@ async function enqueue({ fields: [ { name: "Title", - value: title ? `[${title}](${url})` : url, + value: (title ? `[${title}](${url})` : url).substring(0, 1024), inline: true, }, { From 28481c2775e826d9454d3081e70b4ecdf9055471 Mon Sep 17 00:00:00 2001 From: Cynthia Foxwell Date: Mon, 23 Jan 2023 18:15:54 -0700 Subject: [PATCH 2/2] music: fix media being an object, redundantcy --- src/modules/music.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/modules/music.js b/src/modules/music.js index d0f519e..81c287f 100644 --- a/src/modules/music.js +++ b/src/modules/music.js @@ -213,7 +213,13 @@ async function enqueue({ ].url .replace("vi_webp", "vi") .replace(".webp", ".jpg"); - media = {url: info?.format.sort((a, b) => b.bitrate - a.bitrate)[0].url}; + + const formats = info?.format; + let url; + if (formats) { + formats.sort((a, b) => b.bitrate - a.bitrate); + media = formats[0].url; + } } else if (type == "sc") { if (url?.startsWith("sc:")) url = url.replace(/^sc:/, "https://soundcloud.com/"); @@ -233,7 +239,7 @@ async function enqueue({ title = info.title; length = info.duration; thumbnail = info.artwork_url; - media = {stream: streamUrl}; + media = streamUrl; } else if (type == "file") { title = url; let info; @@ -259,7 +265,7 @@ async function enqueue({ } length = info.duration ? Math.floor(info.duration) * 1000 : 0; - media = {stream: url}; + media = url; } if (connection.connection.playing) { @@ -323,7 +329,7 @@ async function enqueue({ return; } - await connection.connection.play(media.stream, { + await connection.connection.play(media, { inlineVolume: true, voiceDataTimeout: -1, });