murm/mrmBot-Matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed some music player stuff

Browse source
This commit is contained in:
TheEssem 2020-09-22 15:33:07 -05:00
parent 925eb387dd
commit 7047081f98
1 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
utils/soundplayer.js
View file

@ -56,14 +56,16 @@ exports.play = async (sound, message, music = false) => {
const { tracks } = await fetch(`http://${node.host}:${node.port}/loadtracks?identifier=${sound}`, { headers: { Authorization: node.password } }).then(res => res.json()); const { tracks } = await fetch(`http://${node.host}:${node.port}/loadtracks?identifier=${sound}`, { headers: { Authorization: node.password } }).then(res => res.json());
const oldQueue = this.queues.get(voiceChannel.guild.id); const oldQueue = this.queues.get(voiceChannel.guild.id);
if (tracks.length === 0) return client.createMessage(message.channel.id, `${message.author.mention}, I couldn't find that song!`); if (tracks.length === 0) return client.createMessage(message.channel.id, `${message.author.mention}, I couldn't find that song!`);
if (music) {
this.queues.set(voiceChannel.guild.id, oldQueue ? [...oldQueue, tracks[0].track] : [tracks[0].track]); this.queues.set(voiceChannel.guild.id, oldQueue ? [...oldQueue, tracks[0].track] : [tracks[0].track]);
}
const connection = await this.manager.join({ const connection = await this.manager.join({
guild: voiceChannel.guild.id, guild: voiceChannel.guild.id,
channel: voiceChannel.id, channel: voiceChannel.id,
node: node.id node: node.id
}); });
if (oldQueue) { if (oldQueue && music) {
client.createMessage(message.channel.id, `${message.author.mention}, your tune has been added to the queue!`); client.createMessage(message.channel.id, `${message.author.mention}, your tune has been added to the queue!`);
} else { } else {
this.nextSong(message, connection, tracks[0].track, tracks[0].info, music, voiceChannel); this.nextSong(message, connection, tracks[0].track, tracks[0].info, music, voiceChannel);
@ -109,21 +111,22 @@ exports.nextSong = async (message, connection, track, info, music, voiceChannel,
logger.error(error); logger.error(error);
}); });
} }
connection.once("end", async (data) => { connection.on("end", async (data) => {
if (data.reason === "REPLACED") return; if (data.reason === "REPLACED") return;
const queue = this.queues.get(voiceChannel.guild.id); const queue = this.queues.get(voiceChannel.guild.id);
const newQueue = queue.slice(1); const newQueue = queue ? queue.slice(1) : [];
this.queues.set(voiceChannel.guild.id, newQueue); this.queues.set(voiceChannel.guild.id, newQueue);
await playingMessage.delete();
if (newQueue.length === 0) { if (newQueue.length === 0) {
this.manager.leave(voiceChannel.guild.id); this.manager.leave(voiceChannel.guild.id);
connection.destroy(); connection.destroy();
this.players.delete(voiceChannel.guild.id); this.players.delete(voiceChannel.guild.id);
this.queues.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 (music) await client.createMessage(message.channel.id, "🔊 The current voice channel session has ended.");
await playingMessage.delete();
} else { } else {
const track = await fetch(`http://${connection.node.host}:${connection.node.port}/decodetrack?track=${encodeURIComponent(newQueue[0])}`, { headers: { Authorization: connection.node.password } }).then(res => res.json()); const track = 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(message, connection, newQueue[0], track, music, voiceChannel, true); this.nextSong(message, connection, newQueue[0], track, music, voiceChannel, true);
await playingMessage.delete();
} }
}); });
}; };
@ -188,11 +191,11 @@ exports.playing = async (message) => {
}, },
"fields": [{ "fields": [{
"name": "ℹ️ Title:", "name": "ℹ️ Title:",
"value": track.title "value": track.title ? track.title : "Unknown"
}, },
{ {
"name": "🎤 Artist:", "name": "🎤 Artist:",
"value": track.author "value": track.author ? track.author : "Unknown"
}, },
{ {
"name": "💬 Channel:", "name": "💬 Channel:",