mirror of
https://github.com/musix-org/musix-oss
synced 2025-06-16 18:56:00 +00:00
Fixed some errors and messages
This commit is contained in:
MatteZ02
@ -1,6 +1,6 @@
|
||||
/*
|
||||
THIS FILE CONTAINS ALL MESSAGES THAT MUSIX SENDS!
|
||||
THIS IS MUSIX BRANDING AND YOU'RE NOT PERMITTED TO COPY ALL THE VISUALS FROM MUSIX!
|
||||
THIS IS MUSIX BRANDING AND YOU'RE NOT PERMITTED TO COPY THE VISUALS OF MUSIX!
|
||||
IF YOU CLONED THIS REPOSITORY PLEASE MODIFY THESE MESSAGES!
|
||||
*/
|
||||
module.exports = {
|
||||
@ -14,18 +14,18 @@ module.exports = {
|
||||
boolean: "<:redx:674263474704220182> Please define a boolean! (true/false)",
|
||||
bugDesc: "Matte#0002\nOr join the support server: https://discord.gg/rvHuJtB",
|
||||
bugTitle: "Found a bug with Musix?\nDM the core developer:",
|
||||
cancellingVideoSelection: "'<:redx:674263474704220182> Cancelling video selection",
|
||||
cantSkipToCurrent: "<:redx:674263474704220182> You can\'t skip to the song currently playing!",
|
||||
cancellingVideoSelection: "<:redx:674263474704220182> Cancelling video selection",
|
||||
cantSkipToCurrent: "<:redx:674263474704220182> You can't skip to the song currently playing!",
|
||||
cmdUsesFooter: "These statistics are from the current uptime.",
|
||||
cmdUsesTitle: "Musix Command Usage During Current Uptime",
|
||||
correctUsage: "<:redx:674263474704220182> correct usage: ",
|
||||
currentBass: ":loud_sound: The current bass is: ",
|
||||
currentDefaultBass: ":speaker: Currect default bass level:",
|
||||
currentDefaultBass: ":speaker: Currect default bass level: ",
|
||||
currentDefaultVolume: ":speaker: Current default volume is:",
|
||||
currentPrefix: "Current prefix:",
|
||||
currentVolume: ":loud_sound: The current volume is: ",
|
||||
defaultVolumeMax: "<:redx:674263474704220182> The default volume must be below `100` for quality and safety resons.",
|
||||
defaultVolumeNumber: "<:redx:674263474704220182> I\'m sorry, But the default volume needs to be a valid __number__.",
|
||||
defaultVolumeNumber: "<:redx:674263474704220182> I'm sorry, But the default volume needs to be a valid __number__.",
|
||||
defaultVolumeSet: "<:green_check_mark:674265384777416705> Default volume set to:",
|
||||
devMode: "<:redx:674263474704220182> Dev mode has been turned on! Commands are only available to developer(s)!",
|
||||
dispatcherError: "Error with the dispatcher: ",
|
||||
@ -36,8 +36,8 @@ module.exports = {
|
||||
errorConnecting: "Error with connecting to voice channel: ",
|
||||
errorDetected: "Error detected: ",
|
||||
errorDispatcher: "<:redx:674263474704220182> An error has occured while playing music! The queue has been deleted.",
|
||||
errorExe: "<:redx:674263474704220182> there was an error trying to execute that command! Please contact support with the \`bug\` command!",
|
||||
errorExeOpt: "<:redx:674263474704220182> there was an error trying to execute that option! Please contact support with the \`bug\` command!",
|
||||
errorExe: "<:redx:674263474704220182> there was an error trying to execute that command! Please contact support with the `bug` command!",
|
||||
errorExeOpt: "<:redx:674263474704220182> there was an error trying to execute that option! Please contact support with the `bug` command!",
|
||||
evalTitle: "Evaluation Command",
|
||||
helpCmdFooter: "Command Alias:",
|
||||
helpFooter: "\"%PREFIX%help <command>\" to see more information about a command.",
|
||||
@ -67,13 +67,13 @@ module.exports = {
|
||||
notAllowed: "<:redx:674263474704220182> You are not allowed to do that!",
|
||||
notEnoughVotes: "<:redx:674263474704220182> Not enough votes!",
|
||||
notPaused: "<:redx:674263474704220182> The music in not paused!",
|
||||
noVoiceChannel: "<:redx:674263474704220182> I\'m sorry but you need to be in a voice channel to play music!",
|
||||
noVoiceChannel: "<:redx:674263474704220182> I'm sorry but you need to be in a voice channel to play music!",
|
||||
nowPlaying: "__Now playing__",
|
||||
paused: "<:pause:674685548610322462> Paused the music!",
|
||||
permission: "🔒 Permission requirement:",
|
||||
permissionsFalse: "<:redx:674263474704220182> That value is already `false`!",
|
||||
permissionsSetFalse: "<:green_check_mark:674265384777416705> Permissions requirement now set to: \`false\`",
|
||||
permissionsSetTrue: "<:green_check_mark:674265384777416705> Permissions requirement now set to: \`true\`",
|
||||
permissionsSetFalse: "<:green_check_mark:674265384777416705> Permissions requirement now set to: `false`",
|
||||
permissionsSetTrue: "<:green_check_mark:674265384777416705> Permissions requirement now set to: `true`",
|
||||
permissionsTrue: "<:redx:674263474704220182> That value is already `true`!",
|
||||
pinging: "<a:loading:674284196700618783> Pinging...",
|
||||
playlistAdded: "<:green_check_mark:674265384777416705> Playlist: **%TITLE%** has been added to the queue!",
|
||||
@ -84,13 +84,12 @@ module.exports = {
|
||||
provideANumber: "Please provide a number ranging from 1-10 to select one of the search results.",
|
||||
provideASong: "<:redx:674263474704220182> Please provide a song position in queue for me to remove!",
|
||||
queueDeleted: "Queue deleted!",
|
||||
queueDesc: "**Now playing:** %SONG%<a:aNotes:674602408105476106>",
|
||||
queueFirstPage: ":page_facing_up: Page: ${page} :page_facing_up:",
|
||||
queueDesc: "**Now playing:** %SONG%<a:aNotes:674602408105476106>\n:arrow_down: Next in queue :arrow_down:",
|
||||
queueFooter: "More songs in the queue!",
|
||||
queueLength: "<:redx:674263474704220182> There are only %SONGS% amount of songs in the queue!",
|
||||
queuePages: ":arrow_down: Next in queue :arrow_down:",
|
||||
queueTitle: "__Song queue__",
|
||||
reloaded: "All files reloaded!",
|
||||
removed: "🗑️ removed \`%SONG%\` from the queue!",
|
||||
removed: "🗑️ removed `%SONG%` from the queue!",
|
||||
reset: "<:green_check_mark:674265384777416705> Reset __all__ guild settings!",
|
||||
restart: "restarted!",
|
||||
resumed: "<:resume:674685585478254603> Resumed the music!",
|
||||
@ -121,6 +120,6 @@ module.exports = {
|
||||
statusField3: ":stopwatch: Uptime",
|
||||
statusTitle: "Status for Musix",
|
||||
stop: "<:stop:674685626108477519> Stopped the music!",
|
||||
validNumber: "<:redx:674263474704220182> I\'m sorry, But you need to enter a valid __number__.",
|
||||
validNumber: "<:redx:674263474704220182> I'm sorry, But you need to enter a valid __number__.",
|
||||
wrongVoiceChannel: "<:redx:674263474704220182> I'm sorry but you need to be in the same voice channel as Musix to use this command!",
|
||||
};
|
||||
|
||||
@ -1,9 +1,15 @@
|
||||
module.exports = function (client, msg, command) {
|
||||
const serverQueue = client.queue.get(msg.guild.id);
|
||||
const permissions = msg.channel.permissionsFor(msg.author);
|
||||
if (!serverQueue || !serverQueue.playing) return msg.channel.send(client.messages.noServerQueue);
|
||||
if (!serverQueue || !serverQueue.playing) {
|
||||
msg.channel.send(client.messages.noServerQueue);
|
||||
return false;
|
||||
}
|
||||
if (msg.author.id !== client.config.devId) {
|
||||
if (msg.member.voice.channel !== serverQueue.voiceChannel) return msg.channel.send(client.messages.wrongVoiceChannel);
|
||||
if (msg.member.voice.channel !== serverQueue.voiceChannel) {
|
||||
msg.channel.send(client.messages.wrongVoiceChannel);
|
||||
return false;
|
||||
}
|
||||
if (client.global.db.guilds[msg.guild.id].permissions === true) {
|
||||
if (client.global.db.guilds[msg.guild.id].dj) {
|
||||
if (!msg.member.roles.cache.has(client.global.db.guilds[msg.guild.id].djrole)) {
|
||||
@ -11,8 +17,9 @@ module.exports = function (client, msg, command) {
|
||||
return false;
|
||||
} else return true;
|
||||
} else if (!permissions.has(command.permission)) {
|
||||
client.messages.noPerms = client.messages.noPerms.replace("%PERMS%", commands.permissions);
|
||||
msg.channel.send(client.messages.noPerms);
|
||||
let message
|
||||
message = client.messages.noPerms.replace("%PERMS%", commands.permissions);
|
||||
msg.channel.send(message);
|
||||
return false;
|
||||
} else return true;
|
||||
} else return true;
|
||||
|
||||
@ -12,8 +12,9 @@ module.exports = async function (video, msg, voiceChannel, client, playlist = fa
|
||||
if (serverQueue) {
|
||||
serverQueue.songs.push(song);
|
||||
if (playlist) return;
|
||||
client.messages.songsAdded = client.messages.songAdded.replace("%TITLE%", song.title);
|
||||
return msg.channel.send(client.messages.songAdded);
|
||||
let message;
|
||||
message = client.messages.songAdded.replace("%TITLE%", song.title);
|
||||
return msg.channel.send(message);
|
||||
}
|
||||
|
||||
const construct = require("../config/queueConfig.js");
|
||||
|
||||
@ -7,8 +7,9 @@ module.exports = async function (client, msg, youtube, voiceChannel, url) {
|
||||
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);
|
||||
lmsg.edit(client.messages.playlistAdded);
|
||||
let message;
|
||||
message = client.messages.playlistAdded.replace("%TITLE%", playlist.title);
|
||||
lmsg.edit(message);
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
|
||||
Reference in New Issue
Block a user