From d4febfeb081c03bc9c0eb2d63946a88dd4a37660 Mon Sep 17 00:00:00 2001 From: notnull Date: Mon, 9 Dec 2019 14:20:29 -0500 Subject: [PATCH] eslint fixup --- .eslintrc | 4 ++++ src/irc-bot.js | 4 ++-- src/mpc-commands.js | 2 +- src/spotify.js | 11 ++++++----- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.eslintrc b/.eslintrc index fdfe6c1..00317b8 100644 --- a/.eslintrc +++ b/.eslintrc @@ -1,4 +1,5 @@ { + "extends": ["eslint:recommended"], "parser": "babel-eslint", "parserOptions": { "ecmaVersion": 2016, @@ -6,5 +7,8 @@ "ecmaFeatures": { "jsx": true } + }, + "env": { + "node": true } } diff --git a/src/irc-bot.js b/src/irc-bot.js index 75f6624..9fb74a6 100644 --- a/src/irc-bot.js +++ b/src/irc-bot.js @@ -8,7 +8,7 @@ const chalk = require('chalk') const owners = ['notnull'] const autojoin = ['#anarchybots'] -const host = process.env.HOST || localhost +const host = process.env.HOST || 'localhost' const port = process.env.PORT || 6667 const nick = process.env.NICK || 'radiobot' @@ -21,7 +21,7 @@ bot.connect({ host, port, nick }) bot.on('message', event => logEvent(event)) bot.on('connected', () => autojoin.map(c => bot.join(c))) -bot.on('socket close', event => console.log('bot has disconnected.')) +bot.on('socket close', () => console.log('bot has disconnected.')) bot.matchMessage(/^!hello/, event => event.reply('Hi!')) diff --git a/src/mpc-commands.js b/src/mpc-commands.js index 2c12d4b..8a6c374 100644 --- a/src/mpc-commands.js +++ b/src/mpc-commands.js @@ -13,7 +13,7 @@ const getCurrentTrack = () => { const skipTrack = () => { const currentTrack = getCurrentTrack() const track = currentTrack.stdout.toString() - const { stderr, stdout } = spawnSync('mpc', ['next']) + const { stderr } = spawnSync('mpc', ['next']) return { error: stderr.toString(), skip: track } } diff --git a/src/spotify.js b/src/spotify.js index 4201f5d..659c943 100644 --- a/src/spotify.js +++ b/src/spotify.js @@ -21,7 +21,7 @@ const parseTrackData = tracks => { } const searchTrack = event => { - let pattern = /^!search [\"](.+?)[\"]( artist [\"](.+?)[\"])?/ + let pattern = /^!search "(.+?)"( artist "(.+?)")?/ let match = event.message.match(pattern) if (!match) return event.reply( @@ -43,11 +43,11 @@ const searchTrack = event => { } const requestTrack = event => { - let pattern = /^!request [\"](.+?)[\"]( artist [\"](.+?)[\"])?/ + let pattern = /^!request "(.+?)"( artist "(.+?)")?/ let match = event.message.match(pattern) if (!match) return event.reply( - 'Incorrect syntax. Use !search "track name" [artist "artist"] (optional)' + 'Incorrect syntax. Use !request "track name" [artist "artist"] (optional)' ) let query = match[1] @@ -60,13 +60,13 @@ const requestTrack = event => { data.tracks ) printTrackData(trackName, artistName, albumName, uri) - const { error, track } = insertTrack(uri) + const { error } = insertTrack(uri) if (error) return event.reply('Something went wrong.') event.reply(`Requested '${trackName}' by ${artistName}`) }) } -printQuery = query => { +const printQuery = query => { console.log(chalk.red('\n*******************************************\n')) console.log('Sending the following query to Spotify:') console.log(query) @@ -74,6 +74,7 @@ printQuery = query => { } const printTrackNames = items => { console.log(chalk.yellow('\n*******************************************\n')) + console.log('Search returned the following tracks:') items.map(i => console.log(`'${i.name}' by ${i.artists[0].name}`)) console.log(chalk.yellow('\n*******************************************\n')) }