cwchristerw/musix-oss
1
0
Fork 0
mirror of https://github.com/musix-org/musix-oss synced 2025-06-16 18:56:00 +00:00
Code Activity

Fixed some errors and messages

Browse Source
This commit is contained in:
MatteZ02
2020-03-13 16:20:23 +02:00
parent e15e81d9fe
commit 34a5d26829
14 changed files with 69 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
commands/bass.js
View File

@ -16,8 +16,9 @@ module.exports = {
if (bass > 100) return msg.channel.send(client.messages.maxBass);
if (bass < 0) return msg.channel.send(client.messages.positiveBass);
serverQueue.bass = bass;
client.messages.bassApplied = client.messages.bassApplied.replace("%BASS%", bass);
return msg.channel.send(client.messages.bassApplied);
let message;
message = client.messages.bassApplied.replace("%BASS%", bass);
return msg.channel.send(message);
}
}
};

7
commands/help.js
View File

@ -25,11 +25,12 @@ module.exports = {
for (let i = 0; i < categories.length; i++) {
commands += `**» ${categories[i].toUpperCase()}**\n${client.commands.filter(x => x.category === categories[i] && !x.omitFromHelp && !x.onlyDev).map(x => `\`${x.name}\``).join(', ')}\n`;
}
client.messages.help = client.messages.help.replace("%PREFIX%", prefix);
let message;
message = client.messages.helpFooter.replace("%PREFIX%", prefix);
const embed = new Discord.MessageEmbed()
.setTitle(`${client.user.username} ${client.messages.help}`)
.setTitle(`${client.user.username} ${client.messages.helpTitle}`)
.setDescription(commands)
.setFooter(client.messages.helpFooter)
.setFooter(message)
.setColor(client.config.embedColor)
msg.channel.send(embed);
}

7
commands/loopsong.js
View File

@ -11,11 +11,12 @@ module.exports = {
if (client.funcs.check(client, msg, command)) {
if (!serverQueue.songLooping) {
serverQueue.songLooping = true;
client.messages.loopingSong = client.messages.loopingSong.replace("%TITLE%", serverQueue.songs[0].title);
msg.channel.send(client.messages.loopingSong);
let message;
message = client.messages.loopingSong.replace("%TITLE%", serverQueue.songs[0].title);
msg.channel.send(message);
} else {
serverQueue.songLooping = false;
msg.channel.send(client.messages.noLoopingSong);
msg.channel.send(message);
}
}
}

2
commands/nowplaying.js
View File

@ -10,7 +10,7 @@ module.exports = {
const getThumb = require('video-thumbnail-url');
const ytdl = require('ytdl-core');
const serverQueue = client.queue.get(msg.guild.id);
if (!serverQueue || !serverQueue.playing) return msg.channel.send(client.messages.noServerQueue);
if (!serverQueue) return msg.channel.send(client.messages.noServerQueue);
let data = await Promise.resolve(ytdl.getInfo(serverQueue.songs[0].url));
let songtime = (data.length_seconds * 1000).toFixed(0);
serverQueue.time = serverQueue.connection.dispatcher.streamTime;

34
commands/queue.js
View File

@ -9,33 +9,23 @@ module.exports = {
async execute(msg, args, client, Discord, prefix) {
const serverQueue = client.queue.get(msg.guild.id);
if (!serverQueue) return msg.channel.send(client.messages.noServerQueue);
if (args[1]) {
if (isNaN(args[1])) return msg.channel.send(client.messages.validNumber);
}
let page = parseInt(args[1]);
if (!page) page = 1;
let pagetext = client.messages.queuePages;
if (page === 1) pagetext = client.messages.queueFirstPage;
const page = 1;
let queuesongs = serverQueue.songs.slice((page - 1) * 20 + 1, page * 20 + 1);
let queuemessage = `${queuesongs.map(song => `**#** ${song.title}`).join('\n')}`
const hashs = queuemessage.split('**#**').length;
for (let i = 0; i < hashs; i++) {
queuemessage = queuemessage.replace('**#**', `**${i + 1}**`);
}
client.messages.queueDesc = client.messages.queueDesc.replace("%SONG%", song.title);
if (!serverQueue.looping) {
const embed = new Discord.MessageEmbed()
.setTitle(client.messages.queueTitle)
.setDescription(`${client.messages.queueDesc}\n${pagetext}\n${queuemessage}`)
.setColor(client.config.embedColor)
return msg.channel.send(embed);
} else {
const embed = new Discord.MessageEmbed()
.setTitle(client.messages.queueTitle)
.setDescription(`${client.messages.queueDesc}\n${pagetext}\n${queuemessage}`)
.setFooter('<:repeat1:674685561377914892> Currently looping the queue!')
.setColor(client.config.embedColor)
return msg.channel.send(embed);
}
let message;
message = client.messages.queueDesc.replace("%SONG%", serverQueue.songs[0].title);
const embed = new Discord.MessageEmbed()
.setTitle(client.messages.queueTitle)
.setDescription(`${message}\n${queuemessage}`)
.setFooter(`${serverQueue.songs.size - 20} ${client.messages.queueFooter}`)
.setColor(client.config.embedColor)
/*if (serverQueue.songs.size > 20) {
embed.setFooter(`${serverQueue.songs.size - 20} ${client.messages.queueFooter}`)
}*/
return msg.channel.send(embed);
}
};

10
commands/remove.js
View File

@ -13,10 +13,12 @@ module.exports = {
const pos = parseInt(args[1]);
if (isNaN(pos)) return msg.channel.send(client.messages.validNumber);
if (pos < 1) return msg.channel.send(client.messages.noSongs);
client.messages.queueLength = client.messages.queueLength.replace("%LENGTH%", serverQueue.songs.length);
if (pos > serverQueue.songs.length) return msg.channel.send(client.messages.queueLength);
client.messages.removed = client.messages.removed.replace("%SONG%", serverQueue.songs[pos].title);
msg.channel.send(client.messages.removed);
let message1;
let message2;
message1 = client.messages.queueLength.replace("%LENGTH%", serverQueue.songs.length);
if (pos > serverQueue.songs.length) return msg.channel.send(message1);
message2 = client.messages.removed.replace("%SONG%", serverQueue.songs[pos].title);
msg.channel.send(message2);
return serverQueue.songs.splice(pos, 1);
}
}

5
commands/search.js
View File

@ -36,8 +36,9 @@ module.exports = {
const video2 = await youtube.getVideoByID(video.id);
await client.funcs.handleVideo(video2, msg, voiceChannel, client, true);
}
client.messages.playlistAdded = client.messages.playlistAdded.replace("%TITLE%", playlist.title);
return lmsg.edit(client.messages.playlistAdded);
let message;
message = client.messages.playlistAdded.replace("%TITLE%", playlist.title);
return lmsg.edit(message);
} else {
try {
var video = await youtube.getVideo(url);

5
commands/seek.js
View File

@ -16,8 +16,9 @@ module.exports = {
const pos = parseInt(args[1]);
if (isNaN(pos)) {
if (pos < 0) return msg.channel.send(client.messages.seekingPointPositive);
client.messages.seekMax = client.messages.seekMax.replace("%LENGTH%", data.length_seconds);
if (pos > data.length_seconds) return msg.channel.send(client.messages.seekMax);
let message;
message = client.messages.seekMax.replace("%LENGTH%", data.length_seconds);
if (pos > data.length_seconds) return msg.channel.send(message);
point = pos;
}
serverQueue.connection.dispatcher.end();

2
commands/settings.js
View File

@ -17,7 +17,7 @@ module.exports = {
.addField(client.messages.settingsBass, client.messages.settingsBassDesc, true)
.setFooter(client.messages.settingsFooter)
.setAuthor(client.user.username, client.user.displayAvatarURL)
.setColor(client.embedColor)
.setColor(client.config.embedColor)
const permissions = msg.channel.permissionsFor(msg.author);
if (msg.author.id !== client.config.devId) {
if (!permissions.has(command.permission)) return msg.channel.send(client.messages.noPermsManageSettings);