1
0
mirror of https://github.com/musix-org/musix-oss synced 2025-07-03 16:24:28 +00:00

Update 3.5

This commit is contained in:
MatteZ02
2020-06-04 08:26:33 +03:00
parent 256585293e
commit 0874818101
12 changed files with 71 additions and 26 deletions

View File

@ -18,7 +18,7 @@ module.exports = {
if (queue.nigthCore)
return msg.channel.send(client.messages.disableNigthCore);
if (isNaN(bass)) return msg.channel.send(client.messages.validNumber);
if (bass > 100) return msg.channel.send(client.messages.maxBass);
if (bass > 10) return msg.channel.send(client.messages.maxBass);
if (bass < 0) return msg.channel.send(client.messages.positiveBass);
queue.bass = bass;
client.funcs.end(

View File

@ -25,11 +25,16 @@ module.exports = {
getLyrics(options).then((lyrics) => {
if (lyrics === null)
return msg.channel.send(client.messages.noResultsLyrics);
const embed = new Discord.MessageEmbed()
.setTitle(client.messages.lyricsTitle)
.setDescription(lyrics)
.setColor(client.config.embedColor);
msg.channel.send(embed);
for (let i = 0; i < lyrics.length; i += 2000) {
let toi = ""
toi =
lyrics.substring(i, Math.min(lyrics.length, i + 2000));
const embed = new Discord.MessageEmbed()
.setTitle(client.messages.lyricsTitle)
.setDescription(toi)
.setColor(client.config.embedColor);
msg.channel.send(embed);
}
});
},
};

View File

@ -8,15 +8,13 @@ module.exports = {
category: "music",
async execute(msg, args, client, Discord, command) {
const getThumb = require("video-thumbnail-url");
const ytdl = require("ytdl-core");
const queue = client.queue.get(msg.guild.id);
if (!queue) return msg.channel.send(client.messages.noServerQueue);
let data = await Promise.resolve(ytdl.getInfo(queue.songs[0].url));
let songTime = (data.length_seconds * 1000).toFixed(0);
let songTime = (queue.songs[0].length * 1000).toFixed(0);
let completed = (
queue.connection.dispatcher.streamTime + queue.time
).toFixed(0);
let barlength = 30;
let barlength = 20;
let completedpercent = ((completed / songTime) * barlength).toFixed(0);
let array = [];
for (let i = 0; i < completedpercent - 1; i++) {
@ -35,7 +33,7 @@ module.exports = {
}\n${array.join("")} | \`${client.funcs.msToTime(
completed,
"hh:mm:ss"
)} / ${client.funcs.msToTime(songTime, "hh:mm:ss")}\``
)} / ${client.funcs.msToTime(songTime, "hh:mm:ss")}\`\nchannel: \`${queue.songs[0].channel.name}\``
)
.setFooter(`Queued by ${queue.songs[0].author.tag}`)
.setURL(queue.songs[0].url)
@ -43,7 +41,7 @@ module.exports = {
.setColor(client.config.embedColor);
if (queue.nigthCore)
embed.setDescription(
`${client.messages.nowPlayingDesc} ${queue.songs[0].title}`
`${client.messages.nowPlayingDesc} ${queue.songs[0].title} \nchannel: \`${queue.songs[0].channel.name}\``
);
return msg.channel.send(embed);
},

View File

@ -43,9 +43,7 @@ module.exports = {
if (!voiceChannel.speakable)
return msg.channel.send(client.messages.noPermsSpeak);
if (ytdl.validateURL(url)) {
const song = await ytdl.getInfo(url);
const resource = {
title: song.title,
url: url
}
client.funcs.handleVideo(
@ -53,7 +51,7 @@ module.exports = {
msg,
voiceChannel,
client,
true,
false,
"ytdl"
);
} else if (url.match(/^https?:\/\/(open.spotify.com|spotify.com)(.*)$/)) {

View File

@ -19,6 +19,7 @@ module.exports = {
"%SONGS%",
queue.songs.length - 1
);
if (pos < 0) return msg.channel.send(client.messages.noSongsInQueue);
if (pos >= queue.songs.length) return msg.channel.send(message1);
message2 = client.messages.removed.replace(
"%SONG%",