From aecffecdf12b5fe65e06ee8337d3d68185c3c132 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 28 Jun 2013 10:56:38 -0400
Subject: [PATCH 1/7] footer shows total topic post count

---
 public/src/forum/footer.js  |  8 ++++++++
 public/templates/footer.tpl |  2 +-
 src/posts.js                | 19 +++++++++++++++++++
 src/topics.js               |  4 ++++
 src/websockets.js           |  4 ++++
 5 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js
index fea53cec99..57a901689b 100644
--- a/public/src/forum/footer.js
+++ b/public/src/forum/footer.js
@@ -1,5 +1,6 @@
 (function() {
 	var num_users = document.getElementById('number_of_users'),
+		post_stats = document.getElementById('post_stats'),
 		latest_user = document.getElementById('latest_user'),
 		active_users = document.getElementById('active_users'),
 		user_label = document.getElementById('user_label'),
@@ -10,6 +11,12 @@
 	socket.on('user.count', function(data) {
 		num_users.innerHTML = "We currently have <b>" + data.count + "</b> registered users.";
 	});
+
+	socket.emit('post.stats');
+	socket.on('post.stats', function(data) {
+		post_stats.innerHTML = "Our uses have created " + data.topics + " topics and made " + data.posts + " posts.";
+	});
+
 	socket.emit('user.latest', {});
 	socket.on('user.latest', function(data) {
 		if (data.username == '') {
@@ -18,6 +25,7 @@
 			latest_user.innerHTML = "The most recent user to register is <b><a href='/users/"+data.userslug+"'>" + data.username + "</a></b>.";
 		}
 	});
+
 	socket.emit('api:user.active.get');
 	socket.on('api:user.active.get', function(data) {
 		var plural_users = parseInt(data.users) !== 1,
diff --git a/public/templates/footer.tpl b/public/templates/footer.tpl
index e3c3cf2db9..22c79c588b 100644
--- a/public/templates/footer.tpl
+++ b/public/templates/footer.tpl
@@ -9,7 +9,7 @@
 	<div id="footer" class="container hidden-phone" style="padding-top: 50px; display: none">
 		<div class="alert alert-info">
 			<span id="active_users"></span>; <span id="active_record"></span><br />
-			<span id="number_of_users"></span><br />
+			<span id="number_of_users"></span> <span id="post_stats"></span><br />
 			<span id="latest_user"></span>
 		</div>
 		<footer class="footer">Copyright &copy; 2013 <a target="_blank" href="http://www.nodebb.org">NodeBB</a> by <a target="_blank" href="https://github.com/psychobunny">psychobunny</a>, <a href="https://github.com/julianlam" target="_blank">julianlam</a>, <a href="https://github.com/barisusakli" target="_blank">barisusakli</a> from <a target="_blank" href="http://www.designcreateplay.com">designcreateplay</a></footer>
diff --git a/src/posts.js b/src/posts.js
index 0136c729fc..9d6d6abcc3 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -201,6 +201,8 @@ marked.setOptions({
 						timeout: 2000
 					});
 
+					Posts.getTopicPostStats(socket);
+
 					// Send notifications to users who are following this topic
 					threadTools.notify_followers(tid, uid);
 
@@ -265,6 +267,8 @@ marked.setOptions({
 					RDB.zadd(schema.topics().recent, timestamp, tid);
 					RDB.set('tid:' + tid + ':lastposttime', timestamp);
 
+					RDB.incr('totalpostcount');
+
 					user.getUserFields(uid, ['username'], function(data) { // todo parallel
 						//add active users to this category
 						RDB.get('tid:' + tid + ':cid', function(err, cid) {
@@ -339,4 +343,19 @@ marked.setOptions({
 		});				
 	}
 
+	Posts.getTopicPostStats = function(socket) {
+		RDB.mget(['totaltopiccount', 'totalpostcount'], function(err, data) {
+			if(err === null) {
+				var stats = {
+					topics: data[1]?data[1]:0,
+					posts: data[0]?data[0]:0				
+				};
+				
+				socket.emit('post.stats', stats);
+			}				
+			else
+				console.log(err);
+		});
+	}
+
 }(exports));
\ No newline at end of file
diff --git a/src/topics.js b/src/topics.js
index 341d9d2c02..fc46c1114e 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -368,6 +368,8 @@ marked.setOptions({
 							io.sockets.in('category_' + category_id).emit('event:new_topic', topicData);
 							io.sockets.in('recent_posts').emit('event:new_topic', topicData);
 						});
+
+						posts.getTopicPostStats(socket);
 					}
 				});
 
@@ -398,10 +400,12 @@ marked.setOptions({
 				});
 
 				RDB.incr('cid:' + category_id + ':topiccount');
+				RDB.incr('totaltopiccount');
 
 				feed.updateCategory(category_id);
 			});
 		});
 	};
 
+	
 }(exports));
\ No newline at end of file
diff --git a/src/websockets.js b/src/websockets.js
index 0aceb01c8b..fb7a531447 100644
--- a/src/websockets.js
+++ b/src/websockets.js
@@ -160,6 +160,10 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
 			user.count(socket, data);
 		});
 
+		socket.on('post.stats', function(data) {
+			posts.getTopicPostStats(socket);
+		});
+
 		socket.on('user.latest', function(data) {
 			user.latest(socket, data);
 		});

From 0e5f280327b09b242974f5c2ab33494d14c829e8 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 28 Jun 2013 11:36:41 -0400
Subject: [PATCH 2/7] fixed categories read notification bug

---
 src/categories.js |  2 ++
 src/posts.js      |  6 +++---
 src/topics.js     | 11 +++++++----
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/categories.js b/src/categories.js
index a165bfaadf..aa4cc61411 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -352,6 +352,8 @@ var	RDB = require('./redis.js'),
 
 				Categories.hasReadCategories(cids, current_user, function(read_data) {
 					has_read = read_data;
+					console.log(cids, read_data);
+					console.log(current_user);
 					generateCategories();
 				});
 				
diff --git a/src/posts.js b/src/posts.js
index 9d6d6abcc3..6abee53d40 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -186,11 +186,11 @@ marked.setOptions({
 					RDB.del('tid:' + tid + ':read_by_uid'); // let everybody know there is an unread post
 
 					Posts.get_cid_by_pid(pid, function(cid) {
-						RDB.del('cid:' + cid + ':read_by_uid');
+						RDB.del('cid:' + cid + ':read_by_uid', function(err, data) {
+							topics.markAsRead(tid, uid);	
+						});
 						
 						RDB.zadd('categories:recent_posts:cid:' + cid, Date.now(), pid);
-		  	  		
-						topics.markAsRead(tid, uid);
 					});
 
 
diff --git a/src/topics.js b/src/topics.js
index fc46c1114e..2b712bfb33 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -373,8 +373,6 @@ marked.setOptions({
 					}
 				});
 
-				Topics.markAsRead(tid, uid);
-
 				// User Details - move this out later
 				RDB.lpush('uid:' + uid + ':topics', tid);
 
@@ -386,8 +384,13 @@ marked.setOptions({
 				});
 
 				// let everyone know that there is an unread topic in this category
-				RDB.del('cid:' + category_id + ':read_by_uid');
-
+				RDB.del('cid:' + category_id + ':read_by_uid', function(err, data) {
+					console.log('deleted');
+					Topics.markAsRead(tid, uid);
+				});
+				
+				
+				
 				RDB.zadd(schema.topics().recent, Date.now(), tid);
 				//RDB.zadd('topics:active', tid);
 

From d4e5d9cf2ffbb0cdc7a795dc59a21b437d51fa9a Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 28 Jun 2013 11:53:04 -0400
Subject: [PATCH 3/7] removed console.log

---
 src/categories.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/categories.js b/src/categories.js
index aa4cc61411..a165bfaadf 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -352,8 +352,6 @@ var	RDB = require('./redis.js'),
 
 				Categories.hasReadCategories(cids, current_user, function(read_data) {
 					has_read = read_data;
-					console.log(cids, read_data);
-					console.log(current_user);
 					generateCategories();
 				});
 				

From d7fbe6ee144aab24e1dc5757fc95cd7d35cbb6fa Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 28 Jun 2013 11:53:31 -0400
Subject: [PATCH 4/7] removed console.log

---
 src/topics.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/topics.js b/src/topics.js
index 2b712bfb33..659182d0cb 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -385,11 +385,9 @@ marked.setOptions({
 
 				// let everyone know that there is an unread topic in this category
 				RDB.del('cid:' + category_id + ':read_by_uid', function(err, data) {
-					console.log('deleted');
 					Topics.markAsRead(tid, uid);
 				});
-				
-				
+
 				
 				RDB.zadd(schema.topics().recent, Date.now(), tid);
 				//RDB.zadd('topics:active', tid);

From 6a83bf79b49693e54fe1930efcc9d73a709e7ed5 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 28 Jun 2013 12:40:15 -0400
Subject: [PATCH 5/7] fixed the issue with Topics.markAsRead

---
 src/categories.js | 19 +++++++++++++++++++
 src/topics.js     | 10 ++++++++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/categories.js b/src/categories.js
index a165bfaadf..e4ba8ad55e 100644
--- a/src/categories.js
+++ b/src/categories.js
@@ -267,7 +267,26 @@ var	RDB = require('./redis.js'),
 		});
 	}
 
+	Categories.isTopicsRead = function(cid, uid, callback) {
+		RDB.smembers('categories:' + cid + ':tid', function(err, tids) {
 
+			topics.hasReadTopics(tids, uid, function(hasRead) {
+
+				var allread = true;
+				for (var i=0, ii=tids.length; i<ii; i++) {
+					if(hasRead[i] === 0) {
+						allread = false;
+						break;
+					}
+				}
+				callback(allread);				
+			});
+		});
+	}
+
+	Categories.markAsRead = function(cid, uid) {
+		RDB.sadd('cid:' + cid + ':read_by_uid', uid);			
+	}
 
 	Categories.hasReadCategories = function(cids, uid, callback) {
 		var batch = RDB.multi();
diff --git a/src/topics.js b/src/topics.js
index 659182d0cb..0ba2054647 100644
--- a/src/topics.js
+++ b/src/topics.js
@@ -218,10 +218,16 @@ marked.setOptions({
 	}
 
 	Topics.markAsRead = function(tid, uid) {
-		// there is an issue with this fn. if you read a topic that is previously read you will mark the category as read anyways - there is no check
+		
 		RDB.sadd(schema.topics(tid).read_by_uid, uid);
+		
 		Topics.get_cid_by_tid(tid, function(cid) {
-			RDB.sadd('cid:' + cid + ':read_by_uid', uid);
+					
+			categories.isTopicsRead(cid, uid, function(read) {
+				if(read) {
+					categories.markAsRead(cid, uid);
+				}
+			});
 		});
 	}
 

From 8278e524d29fe25365b200292c32fa2434a1462c Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 28 Jun 2013 12:54:56 -0400
Subject: [PATCH 6/7] fixed topic/post count :/

---
 src/posts.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/posts.js b/src/posts.js
index 6abee53d40..a34a2751a9 100644
--- a/src/posts.js
+++ b/src/posts.js
@@ -347,8 +347,8 @@ marked.setOptions({
 		RDB.mget(['totaltopiccount', 'totalpostcount'], function(err, data) {
 			if(err === null) {
 				var stats = {
-					topics: data[1]?data[1]:0,
-					posts: data[0]?data[0]:0				
+					topics: data[0]?data[0]:0,
+					posts: data[1]?data[1]:0				
 				};
 				
 				socket.emit('post.stats', stats);

From ee7a1413b9398b57d362e1e6abfd56e4e238e5dc Mon Sep 17 00:00:00 2001
From: Julian Lam <julian.lam@gmail.com>
Date: Fri, 28 Jun 2013 15:56:44 -0400
Subject: [PATCH 7/7] added favicon

---
 public/favicon.ico | Bin 0 -> 1150 bytes
 src/webserver.js   |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 create mode 100644 public/favicon.ico

diff --git a/public/favicon.ico b/public/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..70b00c430113ac15f50aec20d6d2d7bb892bd160
GIT binary patch
literal 1150
zcmZQzU<5(|0R|wcz>vYhz#zuJz@P!dKp~(AL>x#lFaYJy!T<mN8EApuzI`j&+}u2?
zva)jdvuDrbh_&O_uU~A77A-2Wx3_<1Y;61=gsrTszRs92qyF2sZ(R7yIe74(cVJ-P
zb(lVM+RMx9!Hyj}BLDvVi{a<8va;1c^?%Xzn46n}-GC(iH#s@^5V||u-Q6D}sR6n9
ze{pf~|EW`_{s)EuiWw#*CV%khcXoFEfA8Kspb`jp^XAQeUteFi8HDuDojVt%6;5y7
zyqReI+qZ9r>w_`QoH;|Z{)UEz|Ns8|gJ}iRpm2bN4<Yvh<^Rv0KmY&NuV4TF`0?Za
zx^?URTUc1&)!)|EHVvo`CH~CJ%uw_}?f+X+QnCi<D2z04`SNAc`1tr^Ky@hQz}y`k
z9)98E$&*gl^uokIX>04&tx=wyp78VljL%oASFg_e{rfjFOdTN_=y$GZ)220dcX#)F
o`0zoHkb3gv85sW6Gcf$IXJGii&%khi89xT80jUM)0R|xh0FW@8)c^nh

literal 0
HcmV?d00001

diff --git a/src/webserver.js b/src/webserver.js
index 68a4f51601..ea4a96f322 100644
--- a/src/webserver.js
+++ b/src/webserver.js
@@ -32,7 +32,7 @@ var express = require('express'),
 	};
 
 	// Middlewares
-	app.use(express.favicon());	// 2 args: string path and object options (i.e. expire time etc)
+	app.use(express.favicon(path.join(__dirname, '../', 'public', 'favicon.ico')));
 	app.use(require('less-middleware')({ src: path.join(__dirname, '../', 'public') }));
 	app.use(express.static(path.join(__dirname, '../', 'public')));
 	app.use(express.bodyParser());	// Puts POST vars in request.body