From 1b393bb685f37c35491311dca2cd1112851be667 Mon Sep 17 00:00:00 2001
From: terakilobyte <terakilobyte@gmail.com>
Date: Tue, 5 May 2015 15:35:55 -0400
Subject: [PATCH] Closed #348.

---
 controllers/user.js | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/controllers/user.js b/controllers/user.js
index bd9c4c882e..c7a19547da 100644
--- a/controllers/user.js
+++ b/controllers/user.js
@@ -289,14 +289,25 @@ exports.returnUser = function(req, res, next) {
         if (moment(timeKeys[i - 1]).add(1, 'd').toString()
           === moment(timeKeys[i]).toString()) {
           tmpLongest++;
-          if (tmpLongest >  user.currentStreak) {
-            user.currentStreak = tmpLongest;
-          }
-          if ( user.currentStreak > user.longestStreak) {
-            user.longestStreak = user.currentStreak;
+          user.longestStreak = tmpLongest;
+        } else {
+          tmpLongest = 1;
+        }
+      }
+
+      timeKeys = timeKeys.reverse();
+      var today = moment(Date.now()), currStreak = 1;
+      if (moment(timeKeys[0]).add(1, 'd').toString === today.toString()) {
+        for (var i = 2; i <= timeKeys.length; i++) {
+          if (moment(timeKeys[i-1]).add(1, 'd').toString()
+          === moment(timeKeys[i]).toString()) {
+            currStreak++;
+          } else {
+            break;
           }
         }
       }
+      user.currentStreak = currStreak;
 
       user.save(function(err) {
         if (err) {