From 66dbc3f258d627602659059aafb889537c9b614f Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Sat, 4 May 2013 13:15:47 -0400
Subject: [PATCH 1/5] Highlight username in tavernchat

---
 src/app/helpers.coffee    |  4 ++++
 styles/app/game-pane.styl | 28 +++++++++++++++++++---------
 views/app/game-pane.html  |  3 +--
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/src/app/helpers.coffee b/src/app/helpers.coffee
index 6e6911e1be..e924e15625 100644
--- a/src/app/helpers.coffee
+++ b/src/app/helpers.coffee
@@ -162,4 +162,8 @@ viewHelpers = (view) ->
     return false unless messages?.length > 0
     messages && messages[0].id != lastMessageSeen
 
+  view.fn 'indexOf', (str1, str2) ->
+    return false unless str1 && str2
+    str1.indexOf(str2) != -1
+
 module.exports = { viewHelpers, removeWhitespace, randomVal, daysBetween, dayMapping, username }
diff --git a/styles/app/game-pane.styl b/styles/app/game-pane.styl
index fc1c829866..1a9870afb5 100644
--- a/styles/app/game-pane.styl
+++ b/styles/app/game-pane.styl
@@ -1,20 +1,30 @@
 .full-width
-    width: 100%
+    width 100%
 
 .border-right
-    border-right: 1px solid #ddd
+    border-right 1px solid #ddd
 
 .game-tabs a
-    cursor:pointer
+    cursor pointer
 
 .tab-notification
-    color: #fff;
-    background-color: #51a351
+    color #fff
+    background-color #51a351
 
 .tavern-pane
-    position:relative
-    height:300px
+    position relative
+    height 300px
+
+.tavern-chat
+
+  li
+    height 60px
+    line-height 60px
+    border-bottom 1px solid #ddd
+
+    &.highlight
+      background #EEE
 
 #market-tab
-    position: relative
-    height: 500px
\ No newline at end of file
+    position relative
+    height 500px
diff --git a/views/app/game-pane.html b/views/app/game-pane.html
index 8bc8760a63..b574c1c813 100644
--- a/views/app/game-pane.html
+++ b/views/app/game-pane.html
@@ -91,8 +91,7 @@
             </form>
             <ul class='unstyled tavern-chat'>
                 {#each _tavern.chat.messages as :message}
-                    <li>
-                        <hr/>
+                    <li class="{#if indexOf(:message.text, _user.profile.name)}highlight{/if}">
                         <span class='badge'>{:message.user}</span> {:message.text} - <span class='muted'>{friendlyTimestamp(:message.timestamp)}</span>
                     </li>
                 {/}

From c8ddd395771b2759fa4ca7ca0190b9c8426746f6 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Sat, 4 May 2013 14:56:21 -0400
Subject: [PATCH 2/5] Add relative dates to chat

---
 package.json             | 3 ++-
 src/app/helpers.coffee   | 3 +++
 views/app/game-pane.html | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d84f018c8c..3c931612b8 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,8 @@
     "resolve": "~0.2.3",
     "browserify": "1.17.3",
     "expect.js": "~0.2.0",
-    "derby-i18n": "0.0.1"
+    "derby-i18n": "0.0.1",
+    "relative-date": "~1.1.1"
   },
   "private": true,
   "subdomain": "habitrpg",
diff --git a/src/app/helpers.coffee b/src/app/helpers.coffee
index e924e15625..a60e2b4c03 100644
--- a/src/app/helpers.coffee
+++ b/src/app/helpers.coffee
@@ -1,5 +1,6 @@
 moment = require 'moment'
 _ = require 'underscore'
+relative = require 'relative-date'
 algos = require './algos'
 
 # Absolute diff between two dates
@@ -166,4 +167,6 @@ viewHelpers = (view) ->
     return false unless str1 && str2
     str1.indexOf(str2) != -1
 
+  view.fn 'relativeDate', relative
+
 module.exports = { viewHelpers, removeWhitespace, randomVal, daysBetween, dayMapping, username }
diff --git a/views/app/game-pane.html b/views/app/game-pane.html
index b574c1c813..c6674ad0de 100644
--- a/views/app/game-pane.html
+++ b/views/app/game-pane.html
@@ -92,7 +92,7 @@
             <ul class='unstyled tavern-chat'>
                 {#each _tavern.chat.messages as :message}
                     <li class="{#if indexOf(:message.text, _user.profile.name)}highlight{/if}">
-                        <span class='badge'>{:message.user}</span> {:message.text} - <span class='muted'>{friendlyTimestamp(:message.timestamp)}</span>
+                        <span class='badge'>{:message.user}</span> {:message.text} {:message.timestamp} - <span class='muted'>{relativeDate(:message.timestamp)}</span>
                     </li>
                 {/}
             </ul>

From 68a932d5ab06a573c524cddcfe926d2d6d111b35 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Sat, 4 May 2013 15:00:26 -0400
Subject: [PATCH 3/5] Remove timestamp

---
 views/app/game-pane.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/views/app/game-pane.html b/views/app/game-pane.html
index c6674ad0de..b621f930cf 100644
--- a/views/app/game-pane.html
+++ b/views/app/game-pane.html
@@ -92,7 +92,7 @@
             <ul class='unstyled tavern-chat'>
                 {#each _tavern.chat.messages as :message}
                     <li class="{#if indexOf(:message.text, _user.profile.name)}highlight{/if}">
-                        <span class='badge'>{:message.user}</span> {:message.text} {:message.timestamp} - <span class='muted'>{relativeDate(:message.timestamp)}</span>
+                        <span class='badge'>{:message.user}</span> {:message.text} - <span class='muted'>{relativeDate(:message.timestamp)}</span>
                     </li>
                 {/}
             </ul>

From 3526cd6f7221f9586fa01ba378917427a0075e44 Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Sun, 5 May 2013 13:44:24 -0400
Subject: [PATCH 4/5] Keep relative times updated every 60 seconds

---
 src/app/party.coffee         | 8 ++++++++
 src/server/middleware.coffee | 2 +-
 views/app/party.html         | 4 ++--
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/app/party.coffee b/src/app/party.coffee
index 8159a40493..f3d1367d3d 100644
--- a/src/app/party.coffee
+++ b/src/app/party.coffee
@@ -75,6 +75,14 @@ module.exports.app = (appExports, model, app) ->
   browser = require './browser'
   helpers = require './helpers'
 
+  model.setNull '_currentTime', +new Date()
+
+  # Every 60 seconds, reset the current time so that the chat
+  # can update relative times
+  setInterval ->
+    model.set '_currentTime', +new Date()
+  , 60000
+
   user = model.at('_user')
 
   model.on 'set', '_user.party.invitation', (after, before) ->
diff --git a/src/server/middleware.coffee b/src/server/middleware.coffee
index 8e9cb29cb8..d9a5fed22f 100644
--- a/src/server/middleware.coffee
+++ b/src/server/middleware.coffee
@@ -22,4 +22,4 @@ module.exports.allowCrossDomain = (req, res, next) ->
   if req.method is 'OPTIONS'
     res.send(200);
   else
-    next()
\ No newline at end of file
+    next()
diff --git a/views/app/party.html b/views/app/party.html
index 27a53c604d..91d58a2dc2 100644
--- a/views/app/party.html
+++ b/views/app/party.html
@@ -62,6 +62,6 @@
         <span
             class="label {{#if @message.npc}}label-success{{else if @message.contributor}}label-inverse{{else if equal(@message.uuid,_user.id)}}label-info{{/}} chat-message"
             rel='tooltip' title="{{@message.contributor}}{{@message.npc}}">
-            {{@message.user}}</span> {{@message.text}} - <span class='muted'>{{relativeDate(@message.timestamp)}}
+            {{@message.user}}</span> {{@message.text}} - <span class='muted time'>{relativeDate(@message.timestamp, _currentTime)}
         </span>
-    </li>
\ No newline at end of file
+    </li>

From 669cdb35b6638f5fb4c1a5208a59831b05472b3b Mon Sep 17 00:00:00 2001
From: Daniel Saewitz <switz213@gmail.com>
Date: Sun, 5 May 2013 13:47:50 -0400
Subject: [PATCH 5/5] Cleanup model code

---
 src/app/party.coffee | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/app/party.coffee b/src/app/party.coffee
index f3d1367d3d..dfb28d9f12 100644
--- a/src/app/party.coffee
+++ b/src/app/party.coffee
@@ -75,12 +75,14 @@ module.exports.app = (appExports, model, app) ->
   browser = require './browser'
   helpers = require './helpers'
 
-  model.setNull '_currentTime', +new Date()
+  _currentTime = model.at '_currentTime'
+
+  _currentTime.setNull +new Date()
 
   # Every 60 seconds, reset the current time so that the chat
   # can update relative times
   setInterval ->
-    model.set '_currentTime', +new Date()
+    _currentTime.set +new Date()
   , 60000
 
   user = model.at('_user')