1
0
forked from notnull/apradiobot

eslint fixup

This commit is contained in:
notnull 2019-12-09 14:20:29 -05:00
parent d7325bda64
commit d4febfeb08
4 changed files with 13 additions and 8 deletions

View File

@ -1,4 +1,5 @@
{ {
"extends": ["eslint:recommended"],
"parser": "babel-eslint", "parser": "babel-eslint",
"parserOptions": { "parserOptions": {
"ecmaVersion": 2016, "ecmaVersion": 2016,
@ -6,5 +7,8 @@
"ecmaFeatures": { "ecmaFeatures": {
"jsx": true "jsx": true
} }
},
"env": {
"node": true
} }
} }

View File

@ -8,7 +8,7 @@ const chalk = require('chalk')
const owners = ['notnull'] const owners = ['notnull']
const autojoin = ['#anarchybots'] const autojoin = ['#anarchybots']
const host = process.env.HOST || localhost const host = process.env.HOST || 'localhost'
const port = process.env.PORT || 6667 const port = process.env.PORT || 6667
const nick = process.env.NICK || 'radiobot' const nick = process.env.NICK || 'radiobot'
@ -21,7 +21,7 @@ bot.connect({ host, port, nick })
bot.on('message', event => logEvent(event)) bot.on('message', event => logEvent(event))
bot.on('connected', () => autojoin.map(c => bot.join(c))) 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!')) bot.matchMessage(/^!hello/, event => event.reply('Hi!'))

View File

@ -13,7 +13,7 @@ const getCurrentTrack = () => {
const skipTrack = () => { const skipTrack = () => {
const currentTrack = getCurrentTrack() const currentTrack = getCurrentTrack()
const track = currentTrack.stdout.toString() const track = currentTrack.stdout.toString()
const { stderr, stdout } = spawnSync('mpc', ['next']) const { stderr } = spawnSync('mpc', ['next'])
return { error: stderr.toString(), skip: track } return { error: stderr.toString(), skip: track }
} }

View File

@ -21,7 +21,7 @@ const parseTrackData = tracks => {
} }
const searchTrack = event => { const searchTrack = event => {
let pattern = /^!search [\"](.+?)[\"]( artist [\"](.+?)[\"])?/ let pattern = /^!search "(.+?)"( artist "(.+?)")?/
let match = event.message.match(pattern) let match = event.message.match(pattern)
if (!match) if (!match)
return event.reply( return event.reply(
@ -43,11 +43,11 @@ const searchTrack = event => {
} }
const requestTrack = event => { const requestTrack = event => {
let pattern = /^!request [\"](.+?)[\"]( artist [\"](.+?)[\"])?/ let pattern = /^!request "(.+?)"( artist "(.+?)")?/
let match = event.message.match(pattern) let match = event.message.match(pattern)
if (!match) if (!match)
return event.reply( 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] let query = match[1]
@ -60,13 +60,13 @@ const requestTrack = event => {
data.tracks data.tracks
) )
printTrackData(trackName, artistName, albumName, uri) printTrackData(trackName, artistName, albumName, uri)
const { error, track } = insertTrack(uri) const { error } = insertTrack(uri)
if (error) return event.reply('Something went wrong.') if (error) return event.reply('Something went wrong.')
event.reply(`Requested '${trackName}' by ${artistName}`) event.reply(`Requested '${trackName}' by ${artistName}`)
}) })
} }
printQuery = query => { const printQuery = query => {
console.log(chalk.red('\n*******************************************\n')) console.log(chalk.red('\n*******************************************\n'))
console.log('Sending the following query to Spotify:') console.log('Sending the following query to Spotify:')
console.log(query) console.log(query)
@ -74,6 +74,7 @@ printQuery = query => {
} }
const printTrackNames = items => { const printTrackNames = items => {
console.log(chalk.yellow('\n*******************************************\n')) 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}`)) items.map(i => console.log(`'${i.name}' by ${i.artists[0].name}`))
console.log(chalk.yellow('\n*******************************************\n')) console.log(chalk.yellow('\n*******************************************\n'))
} }