From 0483e6801643a1081cae0868a0b47628879bc56a Mon Sep 17 00:00:00 2001 From: Essem Date: Tue, 6 Jul 2021 09:23:27 -0500 Subject: [PATCH] Sound playback is pain --- utils/soundplayer.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/utils/soundplayer.js b/utils/soundplayer.js index eb0019b..5cbe9d9 100644 --- a/utils/soundplayer.js +++ b/utils/soundplayer.js @@ -142,9 +142,9 @@ exports.nextSong = async (client, message, connection, track, info, music, voice } if (connection.listeners("end").length === 0) { connection.on("end", async (data) => { - const player = this.players.get(voiceChannel.guild.id); if (data.reason === "REPLACED") return; const queue = this.queues.get(voiceChannel.guild.id); + const player = this.players.get(voiceChannel.guild.id); let newQueue; if (player.loop) { queue.push(queue.shift()); @@ -159,13 +159,21 @@ exports.nextSong = async (client, message, connection, track, info, music, voice this.players.delete(voiceChannel.guild.id); this.queues.delete(voiceChannel.guild.id); if (music) await client.createMessage(message.channel.id, "🔊 The current voice channel session has ended."); - if (playingMessage.channel.messages.get(playingMessage.id)) await playingMessage.delete(); - if (player.playMessage.channel.messages.get(player.playMessage.id)) await player.playMessage.delete(); + try { + if (playingMessage.channel.messages.get(playingMessage.id)) await playingMessage.delete(); + if (player.playMessage.channel.messages.get(player.playMessage.id)) await player.playMessage.delete(); + } catch { + // no-op + } } else { const newTrack = await fetch(`http://${connection.node.host}:${connection.node.port}/decodetrack?track=${encodeURIComponent(newQueue[0])}`, { headers: { Authorization: connection.node.password } }).then(res => res.json()); this.nextSong(client, message, connection, newQueue[0], newTrack, music, voiceChannel, player.loop, true, track); - if (newQueue[0] !== track && playingMessage.channel.messages.get(playingMessage.id)) await playingMessage.delete(); - if (newQueue[0] !== track && player.playMessage.channel.messages.get(player.playMessage.id)) await player.playMessage.delete(); + try { + if (newQueue[0] !== track && playingMessage.channel.messages.get(playingMessage.id)) await playingMessage.delete(); + if (newQueue[0] !== track && player.playMessage.channel.messages.get(player.playMessage.id)) await player.playMessage.delete(); + } catch { + // no-op + } } }); }