This commit is contained in:
Emily 2020-04-26 18:04:22 +10:00
commit 5769195df9
6 changed files with 34 additions and 34 deletions

View file

@ -17,6 +17,7 @@ exports.help = {
parameters: '`question` - the question you want to ask'
}
// eslint-disable-next-line no-unused-vars
const responses = require('../assets/json/8ball.json').responses
exports.run = async (client, message, args, level, data) => {

View file

@ -12,7 +12,7 @@ exports.conf = {
exports.help = {
name: 'movehere',
category: 'Music',
description: 'Moves ' + client.config.botName + ' into your voice channel and/or text channel.',
description: 'Moves the bot into your voice channel and/or text channel.',
usage: 'movehere',
parameters: ''
}
@ -20,16 +20,16 @@ exports.help = {
const music = require('../utils/music')
exports.run = async (client, message, args, level, data) => {
// get guild music data
let mGuild = music.getGuild(message.guild.id)
const mGuild = music.getGuild(message.guild.id)
if(!mGuild.playing) {
if (!mGuild.playing) {
return message.channel.send('<:error:466995152976871434> Nothing is playing.')
}
// change text channel
let textChannelChanged = false
if(mGuild.channel.id != message.channel.id) {
if (mGuild.channel.id !== message.channel.id) {
mGuild.channel = message.channel
textChannelChanged = true
@ -38,18 +38,18 @@ exports.run = async (client, message, args, level, data) => {
// move to another voice channel
let voiceChannelMoved = false
if(message.voice.channel && mGuild.voiceChannel && (message.voice.channel != mGuild.voiceChannel.id)) {
if (message.voice.channel && mGuild.voiceChannel && (message.voice.channel !== mGuild.voiceChannel.id)) {
// TODO: this
voiceChannelMoved = true
}
// response
if(textChannelChanged && voiceChannelMoved) {
if (textChannelChanged && voiceChannelMoved) {
return message.channel.send('<:success:466995111885144095> Music playback moved to your voice channel and music messages to your text channel.')
} else if(textChannelChanged) {
} else if (textChannelChanged) {
return message.channel.send('<:success:466995111885144095> Music module will send messages to your text channel.')
} else if(voiceChannelMoved) {
} else if (voiceChannelMoved) {
return message.channel.send('<:success:466995111885144095> Music playback moved to your voice channel.')
} else {
return message.channel.send('<:error:466995152976871434> Music is already playing in your voice channel!')

View file

@ -1,24 +1,24 @@
exports.conf = {
enabled: true,
guildOnly: false,
aliases: [],
permLevel: 'Developer',
requiredPerms: [],
cooldown: 2000
enabled: true,
guildOnly: false,
aliases: [],
permLevel: 'Developer',
requiredPerms: [],
cooldown: 2000
}
exports.help = {
name: 'restart',
category: 'Developer',
description: 'Restarts the bot.',
usage: 'restart',
parameters: ''
name: 'restart',
category: 'Developer',
description: 'Restarts the bot.',
usage: 'restart',
parameters: ''
}
exports.run = async (client, message) => {// eslint-disable-line no-unused-vars
exports.run = async (client, message) => { // eslint-disable-line no-unused-vars
// This actually shuts down the bot, you'll need to use something like pm2 to get it to restart
await message.channel.send("<:reboot:467216876938985482> Restarting...");
await message.channel.send('<:reboot:467216876938985482> Restarting...')
/*
client.commands.forEach( async cmd => {
@ -26,5 +26,5 @@ exports.run = async (client, message) => {// eslint-disable-line no-unused-vars
});
*/
process.exit(1);
};
process.exit(1)
}

View file

@ -21,15 +21,15 @@ const { setVolume } = require('../utils/music')
exports.run = async (client, message, args, level, data) => {
let userVolume = args[0]
if (vol) {
userVolume = Number(vol)
if (userVolume) {
userVolume = Number(userVolume)
let vol = userVolume / 100 * 0.25
userVolume = userVolume / 100 * 0.25
if (vol <= 1) {
setVolume(message.guild, vol)
if (userVolume <= 1) {
setVolume(message.guild, userVolume)
message.reply('set volume to ' + userVolume * 100 + '%')
message.reply('<:success:466995111885144095> Set volume to ' + userVolume * 100 + '%')
}
}
}

View file

@ -11,7 +11,7 @@ const config = {
enabled: false, // enable auto-update
branch: 'next', // git branch
autoFetch: false, // check if an update is available and automatically restart and update
fetchInterval: 60000, // auto-fetch interval in milliseconds
fetchInterval: 60000 // auto-fetch interval in milliseconds
},
// API keys that are required for some features/commands

View file

@ -29,17 +29,16 @@ client.logger = require('./utils/logger')
require('./utils/_functions')(client)
// Set missing values in config from config template
for(let c in client.configTemplate) {
if(typeof client.config[c] == 'undefined') {
for (const c in client.configTemplate) {
if (typeof client.config[c] === 'undefined') {
client.logger.warn('Config value missing: ' + String(c))
client.config[c] = client.configTemplate[c]
}
}
if (typeof client.config.devmode !== 'undefined') { // Check if devmode is explicitly overridden
client.devmode = client.config.devmode
} else { // Check if Woomy is running inside a Docker
} else { // Check if Woomy is running inside a Docker container
if (isDocker() === false) {
client.devmode = true
} else {