add handleSpam

src/spotify.js

@@ -51,31 +51,32 @@ const searchTrack = event => {
 
 const requestTrack = event => {
   if (event.message === request) return handleSpam(event)
+  else {
+    request = event.message
+    let pattern = /^!request "(.+?)"( artist "(.+?)")?/
+    let match = event.message.match(pattern)
+    if (!match)
+      return event.reply(
+        'Incorrect syntax. Use !request "track name" artist "artist name" (artist and artist name optional)'
+      )
 
-  request = event.message
+    let query = match[1]
-  let pattern = /^!request "(.+?)"( artist "(.+?)")?/
+    if (match[3]) query += ` artist:${match[3]}`
-  let match = event.message.match(pattern)
+    //printQuery(query)
-  if (!match)
+    spotify.search({ type: 'track', query }).then(data => {
-    return event.reply(
+      if (!data || !data.tracks) return event.reply('Something went wrong.')
-      'Incorrect syntax. Use !request "track name" artist "artist name" (artist and artist name optional)'
+      if (data.tracks.total === 0) return event.reply('No results.')
-    )
+      const { trackName, artistName, albumName, uri } = parseTrackData(
-
+        data.tracks
-  let query = match[1]
+      )
-  if (match[3]) query += ` artist:${match[3]}`
+      printTrackData(trackName, artistName, albumName, uri)
-  //printQuery(query)
+      const { error } = insertTrack(uri)
-  spotify.search({ type: 'track', query }).then(data => {
+      if (error) return event.reply('Something went wrong.')
-    if (!data || !data.tracks) return event.reply('Something went wrong.')
+      const request = `'${trackName}' by ${artistName}`
-    if (data.tracks.total === 0) return event.reply('No results.')
+      addToPlaylist(event.nick, `${uri} # ${request}`)
-    const { trackName, artistName, albumName, uri } = parseTrackData(
+      event.reply(`Requested ${request}`)
-      data.tracks
+    })
-    )
+  }
-    printTrackData(trackName, artistName, albumName, uri)
-    const { error } = insertTrack(uri)
-    if (error) return event.reply('Something went wrong.')
-    const request = `'${trackName}' by ${artistName}`
-    addToPlaylist(event.nick, `${uri} # ${request}`)
-    event.reply(`Requested ${request}`)
-  })
 }
 
 // const printQuery = query => {