Added initial music commands and category, moved lavalink node config to separate file
This commit is contained in:
parent
111b177968
commit
59c2c230fb
23 changed files with 365 additions and 53 deletions
40
utils/awaitrejoin.js
Normal file
40
utils/awaitrejoin.js
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
// this is a method to wait for someone to rejoin a voice channel
|
||||
const { EventEmitter } = require("events");
|
||||
|
||||
class AwaitRejoin extends EventEmitter {
|
||||
constructor(channel, anyone, memberID) {
|
||||
super();
|
||||
this.member = memberID;
|
||||
this.anyone = anyone;
|
||||
this.channel = channel;
|
||||
this.rejoined = false;
|
||||
this.ended = false;
|
||||
this.bot = channel.guild ? channel.guild.shard.client : channel._client;
|
||||
this.listener = (member, newChannel) => this.verify(member, newChannel);
|
||||
this.bot.on("voiceChannelJoin", this.listener);
|
||||
this.bot.on("voiceChannelSwitch", this.listener);
|
||||
setTimeout(() => this.stop(), 10000);
|
||||
}
|
||||
|
||||
verify(member, channel) {
|
||||
if (this.channel.id === channel.id) {
|
||||
if (this.member === member.id || this.anyone) {
|
||||
this.rejoined = true;
|
||||
this.stop(member);
|
||||
return true;
|
||||
}
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
stop(member) {
|
||||
if (this.ended) return;
|
||||
this.ended = true;
|
||||
this.bot.removeListener("voiceChannelJoin", this.listener);
|
||||
this.bot.removeListener("voiceChannelSwitch", this.listener);
|
||||
this.emit("end", this.rejoined, member);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = AwaitRejoin;
|
||||
|
|
@ -18,6 +18,7 @@ Default prefix is \`&\`.
|
|||
+ [**Fun**](#👌-fun)
|
||||
+ [**Image Editing**](#🖼️-image-editing)
|
||||
+ [**Soundboard**](#🔊-soundboard)
|
||||
+ [**Music**](#🎤-music)
|
||||
`;
|
||||
const commands = collections.commands;
|
||||
const categories = {
|
||||
|
|
@ -26,7 +27,8 @@ Default prefix is \`&\`.
|
|||
tags: ["## 🏷️ Tags"],
|
||||
fun: ["## 👌 Fun"],
|
||||
images: ["## 🖼️ Image Editing", "> These commands support the PNG, JPEG, WEBP, and GIF formats. (GIF support is currently experimental)"],
|
||||
soundboard: ["## 🔊 Soundboard"]
|
||||
soundboard: ["## 🔊 Soundboard"],
|
||||
music: ["## 🎤 Music"]
|
||||
};
|
||||
for (const [command] of commands) {
|
||||
const category = collections.info.get(command).category;
|
||||
|
|
@ -47,9 +49,11 @@ Default prefix is \`&\`.
|
|||
categories.images.push(`+ **${command}**${params ? ` ${params}` : ""} - ${description}`);
|
||||
} else if (category === 6) {
|
||||
categories.soundboard.push(`+ **${command}**${params ? ` ${params}` : ""} - ${description}`);
|
||||
} else if (category === 7) {
|
||||
categories.music.push(`+ **${command}**${params ? ` ${params}` : ""} - ${description}`);
|
||||
}
|
||||
}
|
||||
fs.writeFile(output, `${template}\n${categories.general.join("\n")}\n\n${categories.moderation.join("\n")}\n\n${categories.tags.join("\n")}\n\n${categories.fun.join("\n")}\n\n${categories.images.join("\n")}\n\n${categories.soundboard.join("\n")}`, () => {
|
||||
fs.writeFile(output, `${template}\n${categories.general.join("\n")}\n\n${categories.moderation.join("\n")}\n\n${categories.tags.join("\n")}\n\n${categories.fun.join("\n")}\n\n${categories.images.join("\n")}\n\n${categories.soundboard.join("\n")}\n\n${categories.music.join("\n")}`, () => {
|
||||
logger.log("The help docs have been generated.");
|
||||
});
|
||||
};
|
||||
|
|
@ -1,13 +1,19 @@
|
|||
const client = require("./client.js");
|
||||
const logger = require("./logger.js");
|
||||
const paginator = require("./pagination/pagination.js");
|
||||
const fetch = require("node-fetch");
|
||||
const moment = require("moment");
|
||||
require("moment-duration-format");
|
||||
const { Manager } = require("@lavacord/eris");
|
||||
|
||||
const nodes = [
|
||||
{ id: "1", host: "localhost", port: 2333, password: process.env.LAVAPASS }
|
||||
];
|
||||
const nodes = require("../lavanodes.json");
|
||||
|
||||
let manager;
|
||||
exports.players = new Map();
|
||||
|
||||
const queues = new Map();
|
||||
const skipVotes = new Map();
|
||||
|
||||
exports.manager;
|
||||
|
||||
exports.status = false;
|
||||
|
||||
|
|
@ -27,41 +33,203 @@ exports.checkStatus = async () => {
|
|||
};
|
||||
|
||||
exports.connect = async () => {
|
||||
manager = new Manager(client, nodes, {
|
||||
this.manager = new Manager(client, nodes, {
|
||||
user: client.user.id
|
||||
});
|
||||
const { length } = await manager.connect();
|
||||
const { length } = await this.manager.connect();
|
||||
logger.log(`Successfully connected to ${length} Lavalink node(s).`);
|
||||
manager.on("error", (error, node) => {
|
||||
this.manager.on("error", (error, node) => {
|
||||
logger.error(`An error occurred on Lavalink node ${node}: ${error}`);
|
||||
});
|
||||
};
|
||||
|
||||
exports.play = async (sound, message) => {
|
||||
if (message.member.voiceState.channelID) {
|
||||
if (!message.channel.guild.members.get(client.user.id).permission.has("voiceConnect") || !message.channel.permissionsOf(client.user.id).has("voiceConnect")) return client.createMessage(message.channel.id, `${message.author.mention}, I can't join this voice channel!`);
|
||||
const voiceChannel = message.channel.guild.channels.get(message.member.voiceState.channelID);
|
||||
if (!voiceChannel.permissionsOf(client.user.id).has("voiceConnect")) return client.createMessage(message.channel.id, `${message.author.mention}, I don't have permission to join this voice channel!`);
|
||||
const node = manager.idealNodes[0];
|
||||
const { tracks } = await fetch(`http://${node.host}:${node.port}/loadtracks?identifier=${sound}`, { headers: { Authorization: node.password } }).then(res => res.json());
|
||||
const connection = await manager.join({
|
||||
guild: voiceChannel.guild.id,
|
||||
channel: voiceChannel.id,
|
||||
node: node.id
|
||||
});
|
||||
const playingMessage = await client.createMessage(message.channel.id, "🔊 Playing sound...");
|
||||
await connection.play(tracks[0].track);
|
||||
connection.on("error", (error) => {
|
||||
manager.leave(voiceChannel.guild.id);
|
||||
playingMessage.delete();
|
||||
logger.error(error);
|
||||
});
|
||||
connection.once("end", (data) => {
|
||||
if (data.reason === "REPLACED") return;
|
||||
manager.leave(voiceChannel.guild.id);
|
||||
playingMessage.delete();
|
||||
});
|
||||
exports.play = async (sound, message, music = false) => {
|
||||
if (!message.member.voiceState.channelID) return client.createMessage(message.channel.id, `${message.author.mention}, you need to be in a voice channel first!`);
|
||||
if (!message.channel.guild.members.get(client.user.id).permission.has("voiceConnect") || !message.channel.permissionsOf(client.user.id).has("voiceConnect")) return client.createMessage(message.channel.id, `${message.author.mention}, I can't join this voice channel!`);
|
||||
const voiceChannel = message.channel.guild.channels.get(message.member.voiceState.channelID);
|
||||
if (!voiceChannel.permissionsOf(client.user.id).has("voiceConnect")) return client.createMessage(message.channel.id, `${message.author.mention}, I don't have permission to join this voice channel!`);
|
||||
if (!music && this.manager.voiceStates.has(message.channel.guild.id) && this.players.get(message.channel.guild.id).type === "music") return client.createMessage(message.channel.id, `${message.author.mention}, I can't play a sound effect while playing music!`);
|
||||
const node = this.manager.idealNodes[0];
|
||||
const { tracks } = await fetch(`http://${node.host}:${node.port}/loadtracks?identifier=${sound}`, { headers: { Authorization: node.password } }).then(res => res.json());
|
||||
const connection = await this.manager.join({
|
||||
guild: voiceChannel.guild.id,
|
||||
channel: voiceChannel.id,
|
||||
node: node.id
|
||||
});
|
||||
const oldQueue = queues.get(voiceChannel.guild.id);
|
||||
console.log(tracks);
|
||||
queues.set(voiceChannel.guild.id, oldQueue ? [...oldQueue, tracks[0].track] : [tracks[0].track]);
|
||||
|
||||
if (oldQueue) {
|
||||
client.createMessage(message.channel.id, `${message.author.mention}, your tune has been added to the queue!`);
|
||||
} else {
|
||||
client.createMessage(message.channel.id, `${message.author.mention}, you need to be in a voice channel first!`);
|
||||
this.nextSong(message, connection, tracks[0].track, tracks[0].info, music, voiceChannel);
|
||||
}
|
||||
};
|
||||
|
||||
exports.nextSong = async (message, connection, track, info, music, voiceChannel) => {
|
||||
const parts = Math.floor((0 / info.length) * 10);
|
||||
const playingMessage = await client.createMessage(message.channel.id, !music ? "🔊 Playing sound..." : {
|
||||
"embed": {
|
||||
"color": 16711680,
|
||||
"author": {
|
||||
"name": "Now Playing",
|
||||
"icon_url": client.user.avatarURL
|
||||
},
|
||||
"fields": [{
|
||||
"name": "ℹ️ Title:",
|
||||
"value": info.title
|
||||
},
|
||||
{
|
||||
"name": "🎤 Artist:",
|
||||
"value": info.author
|
||||
},
|
||||
{
|
||||
"name": "💬 Channel:",
|
||||
"value": voiceChannel.name
|
||||
},
|
||||
{
|
||||
"name": `${"▬".repeat(parts)}🔘${"▬".repeat(10 - parts)}`,
|
||||
"value": `${moment.duration(0).format("m:ss", { trim: false })}/${info.isStream ? "∞" : moment.duration(info.length).format("m:ss", { trim: false })}`
|
||||
}]
|
||||
}
|
||||
});
|
||||
await connection.play(track);
|
||||
this.players.set(voiceChannel.guild.id, { player: connection, type: music ? "music" : "sound", host: message.author.id, voiceChannel: voiceChannel, originalChannel: message.channel });
|
||||
connection.on("error", (error) => {
|
||||
playingMessage.delete();
|
||||
this.manager.leave(voiceChannel.guild.id);
|
||||
this.players.delete(voiceChannel.guild.id);
|
||||
queues.delete(voiceChannel.guild.id);
|
||||
throw error;
|
||||
});
|
||||
connection.once("end", async (data) => {
|
||||
if (data.reason === "REPLACED") return;
|
||||
const queue = queues.get(voiceChannel.guild.id);
|
||||
const newQueue = queue.slice(1);
|
||||
queues.set(voiceChannel.guild.id, newQueue);
|
||||
await playingMessage.delete();
|
||||
if (newQueue.length === 0) {
|
||||
this.manager.leave(voiceChannel.guild.id);
|
||||
this.players.delete(voiceChannel.guild.id);
|
||||
queues.delete(voiceChannel.guild.id);
|
||||
await client.createMessage(message.channel.id, "🔊 The current voice channel session has ended.");
|
||||
} 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());
|
||||
this.nextSong(message, connection, newQueue[0], track, music, voiceChannel);
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
exports.stop = async (message) => {
|
||||
if (!message.member.voiceState.channelID) return client.createMessage(message.channel.id, `${message.author.mention}, you need to be in a voice channel first!`);
|
||||
if (!message.channel.guild.members.get(client.user.id).voiceState.channelID) return client.createMessage(message.channel.id, `${message.author.mention}, I'm not in a voice channel!`);
|
||||
if (this.players.get(message.channel.guild.id).host !== message.author.id) return client.createMessage(message.channel.id, `${message.author.mention}, only the current voice session host can stop the music!`);
|
||||
this.players.delete(message.channel.guild.id);
|
||||
this.manager.leave(message.channel.guild.id);
|
||||
await client.createMessage(message.channel.id, "🔊 The current voice channel session has ended.");
|
||||
};
|
||||
|
||||
exports.skip = async (message) => {
|
||||
if (!message.member.voiceState.channelID) return client.createMessage(message.channel.id, `${message.author.mention}, you need to be in a voice channel first!`);
|
||||
if (!message.channel.guild.members.get(client.user.id).voiceState.channelID) return client.createMessage(message.channel.id, `${message.author.mention}, I'm not in a voice channel!`);
|
||||
const player = this.players.get(message.channel.guild.id);
|
||||
if (player.host !== message.author.id) {
|
||||
const voteCount = skipVotes.has(message.guild.id) ? skipVotes.get(message.guild.id) : 0;
|
||||
if (voteCount + 1 === 3) {
|
||||
player.player.stop(message.channel.guild.id);
|
||||
skipVotes.set(message.guild.id, 0);
|
||||
} else {
|
||||
await client.createMessage(message.channel.id, `🔊 Voted to skip song (${voteCount + 1}/3 people have voted).`);
|
||||
skipVotes.set(message.guild.id, voteCount + 1);
|
||||
}
|
||||
} else {
|
||||
player.player.stop(message.channel.guild.id);
|
||||
}
|
||||
};
|
||||
|
||||
exports.pause = async (message) => {
|
||||
if (!message.member.voiceState.channelID) return client.createMessage(message.channel.id, `${message.author.mention}, you need to be in a voice channel first!`);
|
||||
if (!message.channel.guild.members.get(client.user.id).voiceState.channelID) return client.createMessage(message.channel.id, `${message.author.mention}, I'm not in a voice channel!`);
|
||||
if (this.players.get(message.channel.guild.id).host !== message.author.id) return client.createMessage(message.channel.id, `${message.author.mention}, only the current voice session host can pause/resume the music!`);
|
||||
const player = this.players.get(message.channel.guild.id).player;
|
||||
player.pause(!player.paused ? true : false);
|
||||
await client.createMessage(message.channel.id, `🔊 The player has been ${!player.paused ? "paused" : "resumed"}.`);
|
||||
};
|
||||
|
||||
exports.playing = async (message) => {
|
||||
if (!message.member.voiceState.channelID) return client.createMessage(message.channel.id, `${message.author.mention}, you need to be in a voice channel first!`);
|
||||
if (!message.channel.guild.members.get(client.user.id).voiceState.channelID) return client.createMessage(message.channel.id, `${message.author.mention}, I'm not in a voice channel!`);
|
||||
const player = this.players.get(message.channel.guild.id).player;
|
||||
if (!player) return client.createMessage(message.channel.id, `${message.author.mention}, I'm not playing anything!`);
|
||||
const track = await fetch(`http://${player.node.host}:${player.node.port}/decodetrack?track=${encodeURIComponent(player.track)}`, { headers: { Authorization: player.node.password } }).then(res => res.json());
|
||||
const parts = Math.floor((player.state.position / track.length) * 10);
|
||||
await client.createMessage(message.channel.id, {
|
||||
"embed": {
|
||||
"color": 16711680,
|
||||
"author": {
|
||||
"name": "Now Playing",
|
||||
"icon_url": client.user.avatarURL
|
||||
},
|
||||
"fields": [{
|
||||
"name": "ℹ️ Title:",
|
||||
"value": track.title
|
||||
},
|
||||
{
|
||||
"name": "🎤 Artist:",
|
||||
"value": track.author
|
||||
},
|
||||
{
|
||||
"name": "💬 Channel:",
|
||||
"value": message.channel.guild.channels.get(message.member.voiceState.channelID).name
|
||||
},
|
||||
{
|
||||
"name": `${"▬".repeat(parts)}🔘${"▬".repeat(10 - parts)}`,
|
||||
"value": `${moment.duration(player.state.position).format("m:ss", { trim: false })}/${track.isStream ? "∞" : moment.duration(track.length).format("m:ss", { trim: false })}`
|
||||
}]
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
exports.queue = async (message) => {
|
||||
if (!message.member.voiceState.channelID) return client.createMessage(message.channel.id, `${message.author.mention}, you need to be in a voice channel first!`);
|
||||
if (!message.channel.guild.members.get(client.user.id).voiceState.channelID) return client.createMessage(message.channel.id, `${message.author.mention}, I'm not in a voice channel!`);
|
||||
if (!message.channel.guild.members.get(client.user.id).permission.has("addReactions") && !message.channel.permissionsOf(client.user.id).has("addReactions")) return `${message.author.mention}, I don't have the \`Add Reactions\` permission!`;
|
||||
if (!message.channel.guild.members.get(client.user.id).permission.has("embedLinks") && !message.channel.permissionsOf(client.user.id).has("embedLinks")) return `${message.author.mention}, I don't have the \`Embed Links\` permission!`;
|
||||
const queue = queues.get(message.channel.guild.id);
|
||||
const player = this.players.get(message.channel.guild.id).player;
|
||||
const tracks = await fetch(`http://${player.node.host}:${player.node.port}/decodetracks`, { method: "POST", body: JSON.stringify(queue), headers: { Authorization: player.node.password, "Content-Type": "application/json" } }).then(res => res.json());
|
||||
const trackList = [];
|
||||
const firstTrack = tracks.shift();
|
||||
for (const [i, track] of tracks.entries()) {
|
||||
trackList.push(`${i + 1}. ${track.info.author} - **${track.info.title}** (${track.info.isStream ? "∞" : moment.duration(track.info.length).format("m:ss", { trim: false })})`);
|
||||
}
|
||||
const pageSize = 5;
|
||||
const embeds = [];
|
||||
const groups = trackList.map((item, index) => {
|
||||
return index % pageSize === 0 ? trackList.slice(index, index + pageSize) : null;
|
||||
}).filter(Boolean);
|
||||
for (const [i, value] of groups.entries()) {
|
||||
embeds.push({
|
||||
"embed": {
|
||||
"author": {
|
||||
"name": "Queue",
|
||||
"icon_url": client.user.avatarURL
|
||||
},
|
||||
"color": 16711680,
|
||||
"footer": {
|
||||
"text": `Page ${i + 1} of ${groups.length}`
|
||||
},
|
||||
"fields": [{
|
||||
"name": "🎶 Now Playing",
|
||||
"value": `${firstTrack.info.author} - **${firstTrack.info.title}** (${firstTrack.info.isStream ? "∞" : moment.duration(firstTrack.info.length).format("m:ss", { trim: false })})`
|
||||
}, {
|
||||
"name": "🗒️ Queue",
|
||||
"value": value.join("\n")
|
||||
}]
|
||||
}
|
||||
});
|
||||
}
|
||||
if (embeds.length === 0) return `${message.author.mention}, there's nothing in the queue!`;
|
||||
return paginator(message, embeds);
|
||||
};
|
||||
Loading…
Add table
Add a link
Reference in a new issue