Merging 5/5/2013 Master Upstream into DavidLeeBot

.gitignore

@@ -1,4 +1,8 @@
 config.json
 driver.js
 node_modules
-setup.js
+setup.js
+.idea
+.DS_Store
+config/
+db/sparkle.sqlite

.npmignore

@@ -2,3 +2,6 @@ config.json
 driver.js
 node_modules/
 setup.js
+.DS_Store
+config/
+db/sparkle.sqlite

README.md

@@ -2,13 +2,13 @@
 
 A customizable Turntable.fm bot written in node.js utilizing [ttapi](https://github.com/alaingilbert/Turntable-API).
 
-This project is no longer in development. If you have new features or bugfixes, feel free to submit a pull request.
+This project is still maintained, but I don't have a lot of time for development (so updates will probably be slow). If you have new features or bugfixes, please submit a pull request.
 
 ## Installation
 
     npm install sparklebot
 
-Check out the new [Get Started guide](https://github.com/sharedferret/Sparkle-Turntable-Bot/wiki/Get-Started) over on the project's [Wiki page](https://github.com/sharedferret/Sparkle-Turntable-Bot/wiki) for detailed installation instructions.
+Check out the [Get Started guide](https://github.com/sharedferret/Sparkle-Turntable-Bot/wiki/Get-Started) over on the project's [Wiki page](https://github.com/sharedferret/Sparkle-Turntable-Bot/wiki) for detailed installation instructions.
 
 ## Features
 
@@ -25,7 +25,3 @@ The bot can:
 * Log song statistics and chat entries in a MySQL database
 * Receive and respond to commands via a HTTP RESTful API
 * Manage a waitlist/queue for a room
-
-## Help
-
-If you have a **nontrivial** question, feel free to contact me. I'm usually hanging out in the [Indie/Classic Alt 1+Done room](http://turntable.fm/indieclassic_alternative_1_done) on Turntable.

commands/addban.js

@@ -18,8 +18,8 @@ exports.handler = function(data) {
 }
 
 function addToBanList(userid, name, bannedby) {
-    client.query('INSERT INTO BANNED_USERS SET userid = ?, banned_by = ?, timestamp = NOW()',
+    client.query('INSERT INTO ' + config.database.dbname + '.' + config.database.tablenames.banned + ' SET userid = ?, banned_by = ?, timestamp = NOW()',
             [userid, bannedby]);
     bot.speak(name + ' (UID ' + userid + ') has been banned by ' + bannedby + '.');
     bot.boot(userid, 'You have been banned by ' + bannedby + '.');
-}
+}

commands/addtoplaylist.js

@@ -5,11 +5,11 @@ exports.hidden = true;
 exports.enabled = true;
 exports.matchStart = false;
 exports.handler = function(data) {
-    if(admincheck(data.userid)) {
-    	 bot.playlistAll(function (data) {
-                bot.playlistAdd(currentsong.id, data.list.length);
-            }); 
-        bot.snag();
-        output({text: 'Snagging this song, ' + data.name + '!', destination: data.source, userid: data.userid});
-    }
+	if(admincheck(data.userid)) {
+		bot.snag();
+		bot.playlistAll(function (data) {
+			bot.playlistAdd(currentsong._id, data.list.length);
+		});
+		output({text: 'Snagging this song, ' + data.name + '!', destination: data.source, userid: data.userid});
+	}
 }

commands/betrippy.js

@@ -0,0 +1,28 @@
+exports.name = 'betrippy';
+exports.hidden = false;
+exports.enabled = true;
+exports.matchStart = false;
+
+global.isTrippy = false;
+
+exports.handler = function(data) {
+    if (admincheck(data.userid, data)) {
+        var botSay = function(txt) {
+            output({text: txt, destination: data.source, userid: data.userid});    
+        }
+        var avatarIds = [9, 10, 11, 12, 13, 14, 15, 16, 17];
+        var avChanger = function() {
+            if (isTrippy) {
+                var avId = avatarIds[parseInt(Math.random() * avatarIds.length)];
+                bot.setAvatar(avId, function(data, err) {
+                    setTimeout(avChanger, 3100);
+                });
+            }
+        }
+        if (!isTrippy) {
+            isTrippy = true;
+            botSay("Imma be trippy on " + ["DMT", "Bromo-Dragon Fly", "LSD", "Cocaine", "Ecstacy"][ parseInt(Math.random() * 5) ]);
+            avChanger();
+        }
+    }
+}

commands/boot.js

@@ -0,0 +1,19 @@
+exports.name = 'bootuser';
+exports.hidden = true;
+exports.enabled = true;
+exports.matchStart = true;
+
+exports.handler = function(data) {
+    if (admincheck(data.userid, data)) {
+        var nameforid = data.text.substring(10);
+        bot.getUserId(nameforid, function(d) {
+            if (d.success) {
+                var urls = global.booturls;
+                var msg = urls && urls.length > 0? urls[ parseInt(Math.random() * urls.length) ] : "You've been booted by the bot";
+                bot.boot(d.userid, msg);
+            } else {
+                output({text: "User id not found!", destination: 'pm', userid: data.userid});
+            }
+        });
+    }
+};

commands/catfact.js

@@ -6,10 +6,10 @@ exports.handler = function(data) {
     if (config.database.usedb) {
         client.query('SELECT * FROM CATFACTS ORDER BY RAND() LIMIT 1',
             function selectCb(error, results, fields) {
-                if (results[0] != null) {
+                if (results != null && results[0] != null) {
                     var response = (results[0]['fact']);
                     output({text: response, destination: data.source, userid: data.userid});
                 }
         });
     }
-}
+}

commands/catfact2.js

@@ -6,10 +6,10 @@ exports.handler = function(data) {
     if (config.database.usedb) {
         client.query('SELECT * FROM CATFACTS ORDER BY RAND() LIMIT 1',
             function selectCb(error, results, fields) {
-                if (results[0] != null) {
+                if (results != null && results[0] != null) {
                     var response = (results[0]['fact']);
                     output({text: response, destination: data.source, userid: data.userid});
                 }
         });
     }
-}
+}

commands/catfact3.js

@@ -6,10 +6,10 @@ exports.handler = function(data) {
     if (config.database.usedb) {
         client.query('SELECT * FROM CATFACTS ORDER BY RAND() LIMIT 1',
             function selectCb(error, results, fields) {
-                if (results[0] != null) {
+                if (results != null && results[0] != null) {
                     var response = (results[0]['fact']);
                     output({text: response, destination: data.source, userid: data.userid});
                 }
         });
     }
-}
+}

commands/catfact4.js

@@ -6,10 +6,10 @@ exports.handler = function(data) {
     if (config.database.usedb) {
         client.query('SELECT * FROM CATFACTS ORDER BY RAND() LIMIT 1',
             function selectCb(error, results, fields) {
-                if (results[0] != null) {
+                if (results != null && results[0] != null) {
                     var response = (results[0]['fact']);
                     output({text: response, destination: data.source, userid: data.userid});
                 }
         });
     }
-}
+}

commands/enforcementtoggle.js

@@ -0,0 +1,23 @@
+//Toggles the waitlist on/off
+
+exports.name = '.enforcement';
+exports.hidden = true;
+exports.enabled = true;
+exports.matchStart = true;
+exports.handler = function(data) {
+    if (admincheck(data.userid)) {
+        if (data.text.substring(13) == 'on') {
+            config.enforcement.enforceroom = true;
+            bot.speak('Room enforcement has been turned on.');
+            for (i in djs) {
+                djs[i].remaining = config.enforcement.songstoplay;
+            }
+        } else if (data.text.substring(13) == 'off') {
+            config.enforcement.enforceroom = false;
+            bot.speak('Room enforcement has been turned off.');
+            for (i in djs) {
+                djs[i].remaining = config.enforcement.songstoplay - djs[i].remaining;
+            }
+        }
+    }
+}

commands/getpicture.js

@@ -7,25 +7,13 @@ exports.handler = function(data) {
     bot.getUserId(nameforid, function(iddata) {
         if (iddata.success) {
             bot.getProfile(iddata.userid, function(d) {
-                var response;
+                var response = '';
+				console.log('profile', d);
 
                 //Try Facebook
+				//TODO: Re-add Twitter profile picture check (requires 1.1 OAuth)
                 if (d.facebook != null && d.facebook != '') {
-                    var loc = d.facebook.indexOf('facebook.com/');
-                    if (loc >= 0) {
-                        var innerloc = d.facebook.indexOf('profile.php?id=');
-                        var profileid = d.facebook.substring(loc + 13);
-                        if (innerloc >= 0) {
-                            profileid = d.facebook.substring(innerloc + 15);
-                        }
-                        response = d.name + '\'s picture: https://graph.facebook.com/' + profileid + '/picture?type=large';
-                    }
-                }
-
-                //Try Twitter
-                else if (d.twitter != null && d.twitter != '') {
-                    response = d.name + '\'s picture: https://api.twitter.com/1'
-                        + '/users/profile_image?screen_name=' + d.twitter + '&size=bigger';
+					response = d.name + '\'s picture: https://graph.facebook.com/' + d.facebook + '/picture?type=large';
                 } else {
 
                     response = 'I can\'t find one.';

commands/lastplayed.js

@@ -0,0 +1,22 @@
+exports.name = 'lastplayed';
+exports.hidden = false;
+exports.enabled = true;
+exports.matchStart = false;
+exports.handler = function(data) {
+	if (config.database.usedb && currentsong._id) {
+		client.query('SELECT started FROM '
+			+ config.database.dbname + '.' + config.database.tablenames.song + ' WHERE (songid = \''+ currentsong._id +'\') ORDER BY started DESC LIMIT 1',
+			function select(error, results, fields) {
+				var response = '';
+
+				if(results && results.length > 0) {
+					response = 'Last played ' + results[0]['started'] + '.';
+				} else {
+					console.log(error);
+					response = 'This song has not been played before.';
+				}
+
+				output({text: response, destination: data.source, userid: data.userid});
+			});
+	}
+}

commands/listbans.js

@@ -6,8 +6,12 @@ exports.handler = function(data) {
     if (config.database.usedb) {
         client.query('SELECT banned_by, DATE_FORMAT(timestamp, '
             + '\'%c/%d/%y\') AS date, username FROM (SELECT * FROM '
-            + '`BANNED_USERS`) a INNER JOIN (SELECT * FROM (SELECT *'
-            + ' FROM USERS ORDER BY lastseen DESC) as test GROUP BY '
+            + config.database.dbname + '.'
+            + config.database.tablenames.banned + ') a INNER JOIN '
+            + ' (SELECT * FROM (SELECT *'
+            + ' FROM ' + config.database.dbname + '.'
+            + config.database.tablenames.user
+            + ' ORDER BY lastseen DESC) as test GROUP BY '
             + 'userid) b ON a.userid = b.userid',
             function cb (error, results, fields) {
                 var rp = 'Banned users: ';

commands/notrippy.js

@@ -0,0 +1,20 @@
+//Ping bot
+//Useful for users that use the iPhone app
+
+exports.name = 'notrippy';
+exports.hidden = false;
+exports.enabled = true;
+exports.matchStart = false;
+
+
+exports.handler = function(data) {
+    if (admincheck(data.userid, data)) {
+        var botSay = function(txt) {
+            output({text: txt, destination: data.source, userid: data.userid});    
+        }
+        if (isTrippy) {
+            isTrippy = false;
+            botSay("Whoa that was one helluva trip. So messed up right now.");
+        }
+    }
+}

commands/ohmygodmeow.js

@@ -1,6 +1,6 @@
 //Bot freakout
 
-exports.name = 'oh my god meow';
+exports.name = 'oh my god ' + config.botinfo.botname;
 exports.hidden = false;
 exports.enabled = true;
 exports.matchStart = false;
@@ -20,4 +20,4 @@ exports.handler = function(data) {
             output({text: reptarCall(), destination: data.source, userid: data.userid});
         }, 5600);
     }
-}
+}

commands/pilgrim.js

@@ -6,10 +6,10 @@ exports.handler = function(data) {
     if (config.database.usedb) {
         client.query('SELECT * FROM SCOTT_PILGRIM ORDER BY RAND() LIMIT 1',
             function selectCb(error, results, fields) {
-                if (results[0] != null) {
+                if (results != null && results[0] != null) {
                     var response = (results[0]['quote']);
                     output({text: response, destination: data.source, userid: data.userid});
                 }
         });
     }
-}
+}

commands/pilgrim2.js

@@ -6,10 +6,10 @@ exports.handler = function(data) {
     if (config.database.usedb) {
         client.query('SELECT * FROM SCOTT_PILGRIM ORDER BY RAND() LIMIT 1',
             function selectCb(error, results, fields) {
-                if (results[0] != null) {
+                if (results != null && results[0] != null) {
                     var response = (results[0]['quote']);
                     output({text: response, destination: data.source, userid: data.userid});
                 }
         });
     }
-}
+}

commands/pilgrim3.js

@@ -6,10 +6,10 @@ exports.handler = function(data) {
     if (config.database.usedb) {
         client.query('SELECT * FROM SCOTT_PILGRIM ORDER BY RAND() LIMIT 1',
             function selectCb(error, results, fields) {
-                if (results[0] != null) {
+                if (results != null && results[0] != null) {
                     var response = (results[0]['quote']);
                     output({text: response, destination: data.source, userid: data.userid});
                 }
         });
     }
-}
+}