* move shortening to node-shorturl

* add #lca2011 related search terms
* alphas will always be lower case

Author: jdub

lib/proxy.js

@@ -1,7 +1,7 @@
 var	Twitter = require('twitter'),
 	utility = require('./utility'),
-	unempty = utility.unempty,
-	shortUrl = utility.shortUrl;
+	shortUrl = require('shorturl'),
+	unempty = utility.unempty;
 
 var tweetbloat = [
 	// strip thus-far unused geolocation data
@@ -40,8 +40,8 @@ DenbyProxy = function(client, ripley) {
 				header: 'Me'
 			},
 			{	id: 'search',
-				header: 'Search: nodejs, node.js, #denby, hellodenby',
-				search: 'nodejs,node.js,#denby,hellodenby'
+				header: 'Search: nodejs, node.js, #denby, hellodenby, lca2011, linux.conf.au',
+				search: 'nodejs,node.js,#denby,hellodenby,lca2011,linux.conf.au'
 			}
 		]
 	}}};
@@ -73,7 +73,7 @@ DenbyProxy = function(client, ripley) {
 	// Connect to the stream
 	// FIXME: q'n'd user streams solution, without ripley for now
 	//ripley.on('data', send);
-	twitter.stream('user', {track:'nodejs,node.js,#denby,hellodenby'},
+	twitter.stream('user', {track:'nodejs,node.js,#denby,hellodenby,lca2011,linux.conf.au'},
 		function(stream) {
 console.log('USER STREAMING FOR ' + screen_name + ' (' + client.sessionId + ')!');
 			stream.on('data', send);

lib/ripley.js

@@ -4,13 +4,16 @@ var Twitter = require('twitter'),
 	inspect = util.inspect;
 
 
-function Ripley(twitter, sitestreams) {
+function Ripley(twitter, config) {
 	this.twitter = twitter;
+	this.config = config;
 	this.users = {};
 
-	if ( sitestreams === true ) {
+//console.log(inspect(this));
+
+	/*if ( config.sitestreams === true ) {
 		// FIXME: bring up the sitestreams
-	}
+	}*/
 };
 module.exports = Ripley;
 

lib/utility.js

@@ -1,7 +1,3 @@
-var	http = require('http'),
-	urlparse = require('url').parse,
-	querystring = require('querystring');
-
 module.exports.unempty =
 function unempty(o, deleteKeys) {
 	if ( Array.isArray(o) || typeof o == 'object' ) {
@@ -25,104 +21,3 @@ function unempty(o, deleteKeys) {
 	}
 	return o;
 }
-
-module.exports.shortUrl =
-function shortUrl(longurl, shorter, params, callback) {
-	if ( typeof params === 'function' ) {
-		callback = params;
-		params = null;
-	}
-	if ( typeof shorter === 'function' ) {
-		callback = shorter;
-		params = null;
-		shorter = 'arseh.at';
-	} else if ( typeof shorter === 'object' ) {
-		params = shorter;
-		shorter = 'arseh.at';
-	}
-	if ( typeof callback === 'function' && shorter in urlShorters )
-		urlShorters[shorter](longurl, params, callback);
-}
-
-// FIXME: create a simple shorturl processor that takes a string
-//        eg. http://is.gd/api.php?longurl=%s
-
-var urlShorters = {
-	'is.gd': function(url, params, callback) {
-		if ( typeof params === 'function' ) {
-			callback = params;
-			params = null;
-		}
-		get('http://is.gd/api.php', {
-			longurl: url
-		}, function(data) {
-			if ( data.substr(0, 13) === 'http://is.gd/' )
-				callback(data);
-			else
-				callback();
-		});
-	},
-
-	'bit.ly': function(url, params, callback) {
-		if ( typeof params === 'function' ) {
-			callback = params;
-			params = null;
-		}
-		get('http://api.bit.ly/v3/shorten', {
-			login: params.login || null,
-			apiKey: params.apiKey || null,
-			longUrl: url,
-			format: 'json'
-		}, function(data) {
-			try {
-				var json = JSON.parse(data);
-				if ( json.data && json.data.url )
-					callback(json.data.url, json);
-			} catch(error) {
-				callback();
-			}
-		});
-	},
-
-	'arseh.at': function(url, params, callback) {
-		if ( typeof params === 'function' ) {
-			callback = params;
-			params = null;
-		}
-		get('http://arseh.at/api.php', {
-			action: 'shorturl',
-			format: 'simple',
-			url: url
-		}, function(data) {
-			callback(data);
-		});
-	}
-};
-
-function get(uri, params, callback) {
-	if ( typeof params === 'function' ) {
-		callback = params;
-		params = null;
-	}
-	var uri = urlparse(uri),
-		port = (uri.protocol == 'https:') ? 443 : 80,
-		host = uri.host,
-		path = uri.pathname, // FIXME: ignoring uri.search
-		request = http.createClient(port, host).request(
-		'GET', path + '?' + querystring.stringify(params),
-		{ 'Host': host, 'User-Agent': 'Denby' });
-	request.end();
-	request.on('response', function(response) {
-		if ( response.statusCode !== 200 ) {
-			callback(new Error({
-				message: response.statusCode,
-				data: response
-			}));
-			return;
-		}
-		response.setEncoding('utf8');
-		response.on('data', function(chunk) {
-			callback(chunk, response);
-		});
-	});
-}

package.json

@@ -19,6 +19,7 @@
   { "twitter": ">=0.1.11"
   , "socket.io": ">=0.6.3"
   , "creationix": ">=0.0.6"
+  , "shorturl": ">=0.0.2"
   }
 , "engines": ["node >=0.2.0"]
 }

server.js

@@ -18,17 +18,12 @@ try {
 var twitter = Twitter(config.twitter || null);
 twitter.options.secure = config.secure || false;
 twitter.options.cookie_secret = config.secret || null;
-// why doesn't node-twitter do cookie-secure already?
-twitter.options.cookie_options = {
-	httpOnly: true,
-	secure: config.secure
-};
+twitter.options.cookie_options = {}; // httpOly fucks up flashsocket
 
 // Ripley
-var ripley = new Ripley(twitter, config.sitestreams || false);
+var ripley = new Ripley(twitter, config);
 
 // Web
-var fs = require('fs');
 module.exports = require('http').createServer(require('stack')(
 	require('creationix/log')(),
 	require('./lib/gzip-proc')(),
@@ -47,7 +42,7 @@ require('socket.io').listen(module.exports).on('connection', function(client) {
 	// Success! Probably a valid cookie
 	if ( twauth && twauth.user_id && twauth.access_token_secret ) {
 		// Deliberately kill off non-alphas
-		if ( config.alphas && config.alphas.indexOf(twauth.screen_name) < 0 ) {
+		if ( config.alphas && config.alphas.indexOf(twauth.screen_name.toLowerCase()) < 0 ) {
 			console.log('DUMPED NON-ALPHA ' + twauth.screen_name + '!');
 			client.send({AUTHFAIL: "Currently closed for alpha testing. Disconnecting."});
 			setTimeout(function() {