eldonilo/avatar: avatar.js comparison

comparison avatar.js @ 13:38ddd5888b8d

It’s now a client instead of a component. :)

author	Emmanuel Gil Peyrot <linkmauve@linkmauve.fr>
date	Fri, 03 Jun 2011 21:45:59 +0200
parents	a0ed785d1b8d
children	7fdae201c1e2

comparison

equal deleted inserted replaced

-:a0ed785d1b8d
+:38ddd5888b8d
 'use strict';
 var config = require('./configuration');
 var util = require('util');
+var fs = require('fs');
+var http = require('http');
 var xmpp = require('node-xmpp');
-var conn = new xmpp.Component(config);
+var conn = new xmpp.Client(config);
+var Element = require('ltx').Element;
+Element.prototype.getAttribute = function(name) {
+	return this.attrs[name];
+};
+process.addListener('uncaughtException', function (err) {
+	console.log('[41;1mUncaught exception (' + err + '), this should never happen:[0m\n' + err.stack);
+});
 (function() {
 	var send = conn.send;
 	conn.send = function(s) {
 		util.log('Sent: [1;32m' + s + '[0m');
 		onIq(stanza);
 	else
 		onError(stanza);
 });
-conn._uniqueId = 42;
+var getUniqueId = (function() {
-conn.getUniqueId = function(suffix) {
+	var id = 0;
-	return ++this._uniqueId + (suffix?(":"+suffix):"");
+	return function() {
-};
+		return ++id;
+	};
-var Element = require('ltx').Element;
+})();
-Element.prototype.getAttribute = function(name) {
-	return this.attrs[name];
-};
-var fs = require('fs');
-var http = require('http');
-process.addListener('uncaughtException', function (err) {
-	console.log('\x1b[41;1mUncaught exception (' + err + '), this should never happen:\x1b[0m\n' + err.stack);
-});
 var extensions = {
 	png: 'image/png',
 	svg: 'image/svg+xml',
 	jpg: 'image/jpeg',
 		try {
 			var err = stanza.getChild('error').getChild().name;
 		} catch (e) {
 			var err = 'none';
 		}
-		svgError(res, 'Error during query of this user’s vCard: “'+err+'”.');
+		return svgError(res, 'Error during query of this user’s vCard: “'+err+'”.');
-		return;
 	}
 	var vCard = stanza.getChild('vCard', 'vcard-temp');
-	if (!vCard) {
+	if (!vCard)
-		svgError(res, 'Error: this user doesn’t have a vCard.');
+		return svgError(res, 'Error: this user doesn’t have a vCard.');
-		return;
-	}
 	try {
 		var photo = vCard.getChild('PHOTO', 'vcard-temp');
 		var base64 = photo.getChild('BINVAL', 'vcard-temp').getText();
 		try {
 			var type = photo.getChild('TYPE', 'vcard-temp').getText();
 		} catch (e) {
 			if (config.guessType)
 				type = 'image/png'; // FIXME: use magic.
-			else {
+			else
-				svgError(res, 'Error: this user’s vCard doesn’t specify the MIME type of its avatar.');
+				return svgError(res, 'Error: this user’s vCard doesn’t specify the MIME type of its avatar.');
-				return;
-			}
 		}
 		var ext;
 		for (var i in extensions)
 			if (type == extensions[i])
 				ext = i;
 		// Here we don’t try to guess the extension even if the option is set.
 		if (ext === undefined) {
 			console.log('Unknown MIME type: '+type);
-			svgError(res, 'Error: this user’s avatar is in an unknown format.');
+			return svgError(res, 'Error: this user’s avatar is in an unknown format.');
-			return;
 		}
 		var binval = new Buffer(base64.replace(/\n/g, ''), 'base64');
 		fs.writeFile(config.directory+'/'+to+'.'+ext, binval, function() {
 	conn.send(makeError(response));
 }
 var getVCard = function(jid, res) {
-	var id = conn.getUniqueId();
+	var id = getUniqueId();
 	var toSend = new Element('iq', {to: jid, from: config.jid, type: 'get', id: id})
 		.c('vCard', {xmlns: 'vcard-temp'})
 	.up();
 		var ee = easterEggs[i];
 		var file = ee.file || i;
 		var re = ee.re || new RegExp(config.webRoot + file + '$');
 		if (re.test(req.url)) {
 			fs.readFile(file, function(err, content) {
-				if (err) {
+				if (err)
-					svgError(res, 'Error: ' + (ee.error || file + ' unavailable.'));
+					return svgError(res, 'Error: ' + (ee.error || file + ' unavailable.'));
-					return;
-				}
 				res.writeHead(200, {'Content-Type': ee.mime || 'text/plain'});
 				res.end(content);
 			});
 			return;
 		}