cwchristerw/musix-oss
1
0
Fork 0
mirror of https://github.com/musix-org/musix-oss synced 2025-10-31 05:21:34 +00:00
Code Activity

Song author and remove command

Browse Source
This commit is contained in:
MatteZ02
2019-10-24 19:29:04 +03:00
parent 72e600454f
commit bd9ef87dde
3 changed files with 27 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
commands/nowplaying.js
View File

@@ -15,6 +15,7 @@ module.exports = {
const embed = new Discord.RichEmbed() const embed = new Discord.RichEmbed()
.setTitle("__Now playing__") .setTitle("__Now playing__")
.setDescription(`🎶**Now playing:** ${serverQueue.songs[0].title}\n${array.join('')} | \`${client.funcs.msToTime(completed)} / ${client.funcs.msToTime(songtime)}\``) .setDescription(`🎶**Now playing:** ${serverQueue.songs[0].title}\n${array.join('')} | \`${client.funcs.msToTime(completed)} / ${client.funcs.msToTime(songtime)}\``)
.setFooter(`Queued by \`${serverQueue.songs[0].author.tag}\``)
.setURL(serverQueue.songs[0].url) .setURL(serverQueue.songs[0].url)
.setColor("#b50002") .setColor("#b50002")
return message.channel.send(embed); return message.channel.send(embed);

24
commands/remove.js Normal file
View File

@@ -0,0 +1,24 @@
module.exports = {
name: 'remove',
description: 'Remove command.',
cooldown: 5,
execute(message, args, client, Discord, prefix) {
const { voiceChannel } = message.member;
const serverQueue = client.queue.get(message.guild.id);
const permissions = message.channel.permissionsFor(message.author);
if (!serverQueue) return message.channel.send(':x: There is nothing playing');
if (isNaN(args[1])) return message.channel.send(':x: You need to enter a number!');
if (args[1] === "0") return message.channel.send(':x: You can not remove the currently playing song!');
if (args[1] > serverQueue.songs.size) return message.channel.send(`:x: There is only ${serverQueue.songs.size} amount of songs in the queue!`);
if (message.author.id !== '360363051792203779') {
if (voiceChannel !== serverQueue.voiceChannel) return message.channel.send(':x: I\'m sorry but you need to be in the same voice channel as Musix to remove songs!');
if (client.global.db.guilds[message.guild.id].dj) {
if (serverQueue.songs[args[1]].author !== message.author) {
if (!message.member.roles.has(client.global.db.guilds[message.guild.id].djrole)) return message.channel.send(':x: You need the `DJ` role to remove songs queue by others!');
}
} else if (!permissions.has('MANAGE_MESSAGES') && serverQueue.songs[args[1]].author !== message.author) return message.channel.send(':x: You need the `MANAGE_MESSAGES` permission to remove songs queued by others!');
}
message.channel.send(`🗑️ removed \`${serverQueue.songs[args[1]].title}\` from the queue!`);
return serverQueue.songs.splice(args[1], 1);
}
};

3
funcs/handleVideo.js
View File

@@ -3,7 +3,8 @@ module.exports = async function (video, message, voiceChannel, client, playlist
let song = { let song = {
id: video.id, id: video.id,
title: Discord.Util.escapeMarkdown(video.title), title: Discord.Util.escapeMarkdown(video.title),
url: `https://www.youtube.com/watch?v=${video.id}` url: `https://www.youtube.com/watch?v=${video.id}`,
author: message.author
} }
const serverQueue = client.queue.get(message.guild.id); const serverQueue = client.queue.get(message.guild.id);
if (client.global.db.guilds[message.guild.id].defaultVolume === undefined) { if (client.global.db.guilds[message.guild.id].defaultVolume === undefined) {