From 44485a2e403da8d81b55f210a2a341a182fc8f23 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Thu, 2 May 2013 15:45:19 -0400
Subject: [PATCH 1/3] fixed session ids

---
 src/websockets.js | 32 +++++++++++++++++++++++---------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/websockets.js b/src/websockets.js
index b5370b84aa..642a7d5c57 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -1,13 +1,11 @@
-var	SocketIO = require('socket.io').listen(global.server),
+var	SocketIO = require('socket.io').listen(global.server,{log:false}),
 	cookie = require('cookie'),
 	connect = require('connect'),
 	config = require('../config.js');
 
 (function(io) {
 	var	modules = null,
-		sessionID,
-		uid;
-
+			users = {};
 	global.io = io;
 	module.exports.init = function() {
 		modules = global.modules;
@@ -28,16 +26,25 @@ var	SocketIO = require('socket.io').listen(global.server),
 		}
 
 		// Otherwise, continue unimpeded.
-		sessionID = handshakeData.sessionID;
-		global.modules.user.get_uid_by_session(sessionID, function(session_uid) {
-			if (session_uid) uid = session_uid;
-			else uid = 0;
+		var sessionID = handshakeData.sessionID;
+		
+		global.modules.user.get_uid_by_session(sessionID, function(userId) {
+			if (userId)
+			{
+				users[sessionID] = userId;
+			}			
+			else 
+				users[sessionID] = 0;
 
 			accept(null, true);
 		});
 	});
 
 	io.sockets.on('connection', function(socket) {
+		
+		var hs = socket.handshake;
+		
+		var uid = users[hs.sessionID];
 
 		if (DEVELOPMENT === true) {
 			// refreshing templates
@@ -49,10 +56,17 @@ var	SocketIO = require('socket.io').listen(global.server),
     		console.log("error message "+err);
     		socket.emit('event:consolelog',{type:'uncaughtException', stack:err.stack, error:err.toString()});
 		});
-		
 
 		socket.emit('event:connect', {status: 1});
 		
+		socket.on('disconnect', function() {
+      		console.log('Got disconnect! SESSION ID : '+hs.sessionID+' USER ID : '+uid);
+
+      		delete users[hs.sessionID];
+      		console.log(users);
+   		});
+
+		
 		// BEGIN: API calls (todo: organize)
 		//   julian: :^)
 		socket.on('api:user.get', function(data) {

From de28d8af55c331b0067f30e946bcb626b8d54c2e Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Thu, 2 May 2013 16:00:24 -0400
Subject: [PATCH 2/3] token bug

---
 public/templates/home.tpl | 14 ++++++++++++--
 src/websockets.js         |  2 +-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/public/templates/home.tpl b/public/templates/home.tpl
index b49f4c2e85..48aeda29fa 100644
--- a/public/templates/home.tpl
+++ b/public/templates/home.tpl
@@ -3,7 +3,7 @@
 <!-- BEGIN topics -->
 <a href="topic/{topics.slug}"><li class="topic-row">
 	<h4>{topics.title}</h4>
-	<p>Posted {topics.relativeTime} by user {topics.uid}. {topics.post_count} posts.</p>
+	<p>Posted {topics.relativeTime} by user <span id="username"></span>. {topics.post_count} posts.</p>
 </li></a>
 <!-- END topics -->
 </ul>
@@ -14,7 +14,17 @@ new_post.onclick = function() {
 }
 
 jQuery('document').ready(function() {
-
+	var userId = {topics.uid};
+	
+	socket.on('api:user.get', function(userObj) {
+ 		console.log("derp");
+		console.log(userObj);
+		
+	});
+	
+	socket.emit('api:user.get', { fields: [ 'uid' ], 'uid': userId });
+	
+	
 });
 
 
diff --git a/src/websockets.js b/src/websockets.js
index 642a7d5c57..eff9118aa9 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -70,7 +70,7 @@ var	SocketIO = require('socket.io').listen(global.server,{log:false}),
 		// BEGIN: API calls (todo: organize)
 		//   julian: :^)
 		socket.on('api:user.get', function(data) {
-			modules.user.get(socket, uid, data.fields);
+			modules.user.get(socket, data.uid || uid, data.fields);
 		});
 
 		socket.on('user.exists', function(data) {

From 9e7654fa9aaf4ccb3a2c2f89060bb04204770deb Mon Sep 17 00:00:00 2001
From: psychobunny <rodrigues.andrew@gmail.com>
Date: Thu, 2 May 2013 20:11:14 +0000
Subject: [PATCH 3/3] template example for user

---
 public/templates/home.tpl | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/public/templates/home.tpl b/public/templates/home.tpl
index 48aeda29fa..5b6d73797f 100644
--- a/public/templates/home.tpl
+++ b/public/templates/home.tpl
@@ -3,7 +3,7 @@
 <!-- BEGIN topics -->
 <a href="topic/{topics.slug}"><li class="topic-row">
 	<h4>{topics.title}</h4>
-	<p>Posted {topics.relativeTime} by user <span id="username"></span>. {topics.post_count} posts.</p>
+	<p>Posted {topics.relativeTime} by user <span class="username">{topics.uid}</span>. {topics.post_count} posts.</p>
 </li></a>
 <!-- END topics -->
 </ul>
@@ -14,15 +14,21 @@ new_post.onclick = function() {
 }
 
 jQuery('document').ready(function() {
-	var userId = {topics.uid};
-	
-	socket.on('api:user.get', function(userObj) {
- 		console.log("derp");
-		console.log(userObj);
+	jQuery('.username').each(function() {
+		var userId = this.innerHTML;
+
+		socket.on('api:user.get', function(userObj) {
+	 		console.log("derp");
+			console.log(userObj);
+			
+		});
 		
-	});
+		socket.emit('api:user.get', { fields: [ 'uid' ], 'uid': userId });
+
+	})
+	
+	
 	
-	socket.emit('api:user.get', { fields: [ 'uid' ], 'uid': userId });
 	
 	
 });