Merge remote-tracking branch 'origin' into thread_options

Conflicts:
	public/src/templates.js

src/categories.js

@@ -15,6 +15,8 @@ var	RDB = require('./redis.js'),
 			// Topic Info
 			RDB.set('cid:' + cid + ':name', data.name);
 			RDB.set('cid:' + cid + ':description', data.description);
+			RDB.set('cid:' + cid + ':icon', data.icon);
+			RDB.set('cid:' + cid + ':blockclass', data.blockclass);
 			RDB.set('cid:' + cid + ':slug', slug);
 		
 			RDB.set('category:slug:' + slug + ':cid', cid);
@@ -29,11 +31,15 @@ var	RDB = require('./redis.js'),
 		RDB.lrange('categories:cid', 0, -1, function(cids) {
 			var name = [],
 				description = [],
+				icon = [],
+				blockclass = [],
 				slug = [];
 
 			for (var i=0, ii=cids.length; i<ii; i++) {
 				name.push('cid:' + cids[i] + ':name');
 				description.push('cid:' + cids[i] + ':description');
+				icon.push('cid:' + cids[i] + ':icon');
+				blockclass.push('cid:' + cids[i] + ':blockclass');
 				slug.push('cid:' + cids[i] + ':slug');
 			}
 
@@ -41,11 +47,15 @@ var	RDB = require('./redis.js'),
 				RDB.multi()
 					.mget(name)
 					.mget(description)
+					.mget(icon)
+					.mget(blockclass)
 					.mget(slug)
 					.exec(function(err, replies) {
 						name = replies[0];
 						description = replies[1];
-						slug = replies[2];
+						icon = replies[2];
+						blockclass = replies[3];
+						slug = replies[4];
 						
 						var categories = [];
 						for (var i=0, ii=cids.length; i<ii; i++) {
@@ -54,6 +64,8 @@ var	RDB = require('./redis.js'),
 								'cid' : cids[i],
 								'slug' : slug[i],
 								'description' : description[i],
+								'blockclass' : blockclass[i],
+								'icon' : icon[i],
 								/*'topics' : [0,1], later
 								'latest_post' : {
 									'uid' : 1,

src/topics.js

@@ -67,7 +67,11 @@ var	RDB = require('./redis.js'),
 								});
 							}
 						
-							callback({'category_id': category_id, 'topics': topics});
+							callback({
+								'show_topic_button' : category_id ? 'show' : 'hidden',
+								'category_id': category_id,
+								'topics': topics
+							});
 						});
 
 						

src/user.js

@@ -326,17 +326,13 @@ var	config = require('../config.js'),
 		RDB.get('username:' + username + ':uid', callback);
 	};
 
-	User.get_username_by_uid = function(uid, callback) {
-		User.getUserField(uid, 'username', callback);
-	};
-
 	User.get_usernames_by_uids = function(uids, callback) {
 		
 		var usernames = [];
 		
 		for(var i=0, ii=uids.length; i<ii; ++i) {
 		
-			User.get_username_by_uid(uids[i], function(username){
+			User.getUserField(uids[i],'username', function(username){
 
 				usernames.push(username);
 

src/webserver.js

@@ -110,6 +110,7 @@ passport.deserializeUser(function(uid, done) {
 
 		next();
 	});
+	
 	// Dunno wtf this does
 	//	app.use(express.logger({ format: '\x1b[1m:method\x1b[0m \x1b[33m:url\x1b[0m :response-time ms' }));
 	// Useful if you want to use app.put and app.delete (instead of app.post all the time)
@@ -124,7 +125,7 @@ passport.deserializeUser(function(uid, done) {
 
 	// Basic Routes (entirely client-side parsed, goal is to move the rest of the crap in this file into this one section)
 	(function() {
-		var routes = ['', 'login', 'register', 'account'];
+		var routes = ['', 'login', 'register', 'account', 'latest', 'popular', 'active'];
 
 		for (var i=0, ii=routes.length; i<ii; i++) {
 			(function(route) {
@@ -191,11 +192,25 @@ passport.deserializeUser(function(uid, done) {
 				break;
 			case 'category' :
 					global.modules.topics.get(function(data) {
-						console.log(data);
 						res.send(JSON.stringify(data));
 					}, req.params.id);
 				break;
-			case 'account' : 
+			case 'latest' :
+					global.modules.topics.get(function(data) {
+						res.send(JSON.stringify(data));
+					});
+				break;
+			case 'popular' :
+					global.modules.topics.get(function(data) {
+						res.send(JSON.stringify(data));
+					});
+				break;
+			case 'active' :
+					global.modules.topics.get(function(data) {
+						res.send(JSON.stringify(data));
+					});
+				break;
+			case 'users' : 
 					get_account_fn(req, res, function(userData) {
 						res.send(JSON.stringify(userData));
 					});
@@ -313,19 +328,24 @@ passport.deserializeUser(function(uid, done) {
 	//to baris, move this into account.js or sth later - just moved this out here for you to utilize client side tpl parsing
 	//I didn't want to change too much so you should probably sort out the params etc
 	function get_account_fn(req, res, callback) {
-		console.log("GOING TO ACCOUNT");
 
  		if (req.user === undefined) 
  			return res.redirect('/403');
+	
+		var requestedUserId = req.user.uid;
 
-		user.getUserData(req.user.uid, function(data) {
+		if(req.params.id != req.user.uid)
+			requestedUserId = req.params.id;
 
-			data.joindate = utils.relativeTime(data.joindate);
-
-			console.log("user data" + JSON.stringify(data));
-			
-			var userData = {user:data};
-			callback(userData);
+		user.getUserData(requestedUserId, function(data) {
+			if(data)
+			{
+				data.joindate = utils.relativeTime(data.joindate);
+				
+				callback({user:data});
+			}
+			else
+				callback({user:{}});
 		});
 	}
 
@@ -349,11 +369,28 @@ passport.deserializeUser(function(uid, done) {
 		res.send('User list');
 	});
 
-	app.get('/users/:username', function(req, res) {
-		global.modules.user.get_uid_by_username(req.params.username, function(uid) {
-			res.send('User profile for uid: ' + uid);
+	app.get('/users/:uid', handleUserProfile);
+	app.get('/users/:uid/:username*', handleUserProfile);
+	
+
+	function handleUserProfile(req, res) {
+		
+		if(req.params.uid == 0) {
+			res.send("User doesn't exist!");
+			return;
+		}
+
+		user.getUserData(req.params.uid, function(data) {
+			if(data) {
+				if(req.url.indexOf(data.username) == -1)
+					res.redirect(301, '/users/'+req.params.uid+'/'+data.username);
+				else
+					res.send(templates['header'] + '<script>templates.ready(function(){ajaxify.go("users/' + req.params.uid +'/'+data.username + '");});</script>' + templates['footer']);
+			}
+			else
+				res.send("User doesn't exist!");			
 		});
-	});
+	}
 
 	app.get('/test', function(req, res) {
 		global.modules.topics.delete(1, 1);

src/websockets.js

@@ -123,12 +123,6 @@ var	SocketIO = require('socket.io').listen(global.server,{log:false}),
 				
 		});
 		
-		socket.on('api:user.getNameByUid', function(data) {
-			modules.user.get_username_by_uid(data.uid, function(data){
-				socket.emit('api:user.getNameByUid', data);
-			});
-		});
-
 		socket.on('user.exists', function(data) {
 			modules.user.exists(socket, data.username);
 		});