diff --git a/bot/bot.js b/bot/bot.js index e72a432..14e5d28 100644 --- a/bot/bot.js +++ b/bot/bot.js @@ -9,77 +9,77 @@ let commands = {}; const bot = new Discord.Client(); -bot.on('ready', function () { - console.log('Logged in! Serving in ' + bot.guilds.array().length + ' servers'); - require('./plugins.js').init(); - console.log('type ' + botConfig.prefix + 'help in Discord for a commands list.'); - bot.user.setActivity(botConfig.prefix + 'tip'); +bot.on('ready', function() { + console.log(`Logged in! Serving in ${bot.guilds.array().length} servers`); + require('./plugins.js').init(); + console.log(`type ${botConfig.prefix}help in Discord for a commands list.`); + bot.user.setActivity(botConfig.prefix + 'tip'); }); -bot.on('disconnected', function () { - console.log('Disconnected!'); - process.exit(1); //exit node.js with an error +bot.on('disconnected', function() { + console.log('Disconnected!'); + process.exit(1); //exit node.js with an error }); function checkMessageForCommand(msg) { - //check if message is a command - if (msg.author.id !== bot.user.id && msg.content.startsWith(botConfig.prefix)) { - console.log('treating ' + msg.content + ' from ' + msg.author + ' as command'); - let cmdTxt = msg.content.split(' ')[0].substring(botConfig.prefix.length); - let suffix = msg.content.substring(cmdTxt.length + botConfig.prefix.length + 1); //add one for the ! and one for the space - if (msg.isMentioned(bot.user)) { - try { - cmdTxt = msg.content.split(' ')[1]; - suffix = msg.content.substring(bot.user.mention().length + cmdTxt.length + botConfig.prefix.length + 1); - } catch (e) { - //no command - return msg.channel.send('Yes?'); - } - } - let cmd = commands[cmdTxt]; - if (cmd) { - // Add permission check here later on ;) - try { - cmd.process(bot, msg, suffix); - } catch (e) { - let msgTxt = `command ${cmdTxt} failed :(`; - if (botConfig.debug) { - msgTxt += '\n' + e.stack; - } - msg.channel.send(msgTxt); - } - } - } else { - //message isn't a command or is from us - //drop our own messages to prevent feedback loops - if (msg.author === bot.user) { - return; - } - - if (msg.author !== bot.user && msg.isMentioned(bot.user)) { - msg.channel.send('yes?'); //using a mention here can lead to looping - } + //check if message is a command + if (msg.author.id !== bot.user.id && msg.content.startsWith(botConfig.prefix)) { + console.log(`treating ${msg.content} from ${msg.author} as command`); + let cmdTxt = msg.content.split(' ')[0].substring(botConfig.prefix.length); + let suffix = msg.content.substring(cmdTxt.length + botConfig.prefix.length + 1); //add one for the ! and one for the space + if (msg.isMentioned(bot.user)) { + try { + cmdTxt = msg.content.split(' ')[1]; + suffix = msg.content.substring(bot.user.mention().length + cmdTxt.length + botConfig.prefix.length + 1); + } catch (e) { + //no command + return msg.channel.send('Yes?'); + } } + let cmd = commands[cmdTxt]; + if (cmd) { + // Add permission check here later on ;) + try { + cmd.process(bot, msg, suffix); + } catch (e) { + let msgTxt = `command ${cmdTxt} failed :(`; + if (botConfig.debug) { + msgTxt += '\n' + e.stack; + } + msg.channel.send(msgTxt); + } + } + } else { + //message isn't a command or is from us + //drop our own messages to prevent feedback loops + if (msg.author === bot.user) { + return; + } + + if (msg.author !== bot.user && msg.isMentioned(bot.user)) { + msg.channel.send('yes?'); //using a mention here can lead to looping + } + } } bot.on('message', msg => checkMessageForCommand(msg)); -exports.addCommand = function (commandName, commandObject) { - try { - commands[commandName] = commandObject; - } catch (err) { - console.log(err); - } +exports.addCommand = function(commandName, commandObject) { + try { + commands[commandName] = commandObject; + } catch (err) { + console.log(err); + } }; -exports.addCustomFunc = function (customFunc) { - try { - customFunc(bot); - } catch (err) { - console.log(err); - } +exports.addCustomFunc = function(customFunc) { + try { + customFunc(bot); + } catch (err) { + console.log(err); + } }; -exports.commandCount = function () { - return Object.keys(commands).length; +exports.commandCount = function() { + return Object.keys(commands).length; }; bot.login(botConfig.token); diff --git a/bot/modules/tipbot.js b/bot/modules/tipbot.js index e0682e5..32319cf 100644 --- a/bot/modules/tipbot.js +++ b/bot/modules/tipbot.js @@ -47,7 +47,7 @@ function doBalance(message, tipper) { if (err) { message.reply('Error getting balance'); } else { - message.reply('You have *' + balance + '* LBC'); + message.reply(`You have *${balance}* LBC`); } }); } @@ -60,7 +60,7 @@ function doDeposit(message, tipper) { if (err) { message.reply('Error getting deposit address'); } else { - message.reply('Your address is ' + address); + message.reply(`Your address is ${address}`); } }); } @@ -115,7 +115,7 @@ function doTip(message, tipper, words) { function doHelp(message) { if (!inPrivateOrBotSandbox(message)) { - message.reply('Sent you help via DM! Please use <#369896313082478594> or DMs to talk to bots.'); + message.reply(`Sent you help via DM! Please use <#${sandboxChannel}> or DMs to talk to bots.`); } message.author.send(`**!tip** balance: get your balance diff --git a/package.json b/package.json index ca9ea86..57cece3 100644 --- a/package.json +++ b/package.json @@ -15,11 +15,11 @@ "request": "^2.83.0" }, "scripts": { - "prettier": "prettier --write bot/**/*.js --single-quote --print-width 240", + "prettier": "prettier --write '{bot,.}/**/*.{js,json}' --single-quote --print-width 240", "build": "babel bot -d dist", "prod": "babel bot -d dist & node dist/bot.js", - "lint": "prettier --write bot/**/*.js --single-quote --print-width 240", - "precommit": "prettier --write bot/**/*.js --single-quote --print-width 240" + "lint": "prettier --write '{bot,.}/**/*.{js,json}' --single-quote --print-width 240", + "precommit": "prettier --write '{bot,.}/**/*.{js,json}' --single-quote --print-width 240" }, "devDependencies": { "prettier": "1.7.4"