From 4ddd4e4c131cb5c22332020dc8c57f65efd58f77 Mon Sep 17 00:00:00 2001
From: Brian Smith <briansmith@jamkazam.com>
Date: Sun, 14 Sep 2014 19:17:16 -0400
Subject: [PATCH] VRFS-2066 fixed some issues with session landing and feed

---
 ruby/lib/jam_ruby/models/music_session.rb              | 2 +-
 web/app/assets/javascripts/tickDuration.js             | 4 ++--
 web/app/helpers/feeds_helper.rb                        | 4 ++--
 web/app/views/api_feeds/show.rabl                      | 6 +++---
 web/app/views/users/_feed_music_session.html.haml      | 4 ++--
 web/app/views/users/_feed_music_session_ajax.html.haml | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/music_session.rb b/ruby/lib/jam_ruby/models/music_session.rb
index 557d51f9c..d00386eef 100644
--- a/ruby/lib/jam_ruby/models/music_session.rb
+++ b/ruby/lib/jam_ruby/models/music_session.rb
@@ -415,7 +415,7 @@ module JamRuby
     end
 
     def duration_minutes
-      end_time = self.session_removed_at || Time.now
+      end_time = self.session_removed_at || Time.now.utc
       (end_time - self.created_at) / 60.0
     end
 
diff --git a/web/app/assets/javascripts/tickDuration.js b/web/app/assets/javascripts/tickDuration.js
index 107336220..fcdccde63 100644
--- a/web/app/assets/javascripts/tickDuration.js
+++ b/web/app/assets/javascripts/tickDuration.js
@@ -8,8 +8,8 @@
       $.each($(customSelector ? customSelector : '.inprogress .tick-duration'), function(index, item) {
         var $duration = $(item);
         var createdAt = new Date(Number($duration.attr('data-created-at')) * 1000)
-        var millisElapsed = (context.JK.nowUTC().getTime() - createdAt.getTime());
-        $duration.text(context.JK.prettyPrintSeconds( parseInt(millisElapsed / 1000)));
+        var millisElapsed = (new Date().getTime() - createdAt.getTime());
+        $duration.text(context.JK.prettyPrintSeconds(parseInt(millisElapsed / 1000)));
       });
     }, 333);
   }
diff --git a/web/app/helpers/feeds_helper.rb b/web/app/helpers/feeds_helper.rb
index c77c382cd..9a693498f 100644
--- a/web/app/helpers/feeds_helper.rb
+++ b/web/app/helpers/feeds_helper.rb
@@ -23,9 +23,9 @@ module FeedsHelper
 
   def session_duration_value(music_session)
     if music_session.session_removed_at.nil?
-     Time.now - music_session.created_at
+      Time.now.utc - music_session.started_at
     else
-      music_session.session_removed_at - music_session.created_at
+      music_session.session_removed_at - music_session.started_at
     end
   end
 
diff --git a/web/app/views/api_feeds/show.rabl b/web/app/views/api_feeds/show.rabl
index fc877a6ec..51b862d44 100644
--- a/web/app/views/api_feeds/show.rabl
+++ b/web/app/views/api_feeds/show.rabl
@@ -7,7 +7,7 @@ glue :music_session do
     'music_session'
   end
 
-  attributes :id, :genres, :created_at, :session_removed_at, :comment_count, :like_count, :play_count, :fan_access, :is_over?, :has_mount?
+  attributes :id, :genres, :created_at, :started_at, :session_removed_at, :comment_count, :like_count, :play_count, :fan_access, :is_over?, :has_mount?
 
   node do |history|
   {
@@ -17,12 +17,12 @@ glue :music_session do
       artist_id: session_artist_id(history),
       artist_datakey: session_artist_datakey(history),
       artist_hoveraction: session_artist_hoveraction(history),
-      utc_created_at: history.created_at.getutc.iso8601,
+      utc_created_at: history.started_at.getutc.iso8601,
       name: session_name(history, current_user),
       description: session_description(history, current_user),
       status: session_text(history),
       duration: session_duration_value(history),
-      duration_secs: history.created_at.to_i,
+      duration_secs: history.started_at.to_i,
       genre: session_genre(history)
     }
   }
diff --git a/web/app/views/users/_feed_music_session.html.haml b/web/app/views/users/_feed_music_session.html.haml
index 33be9304f..8eb662d47 100644
--- a/web/app/views/users/_feed_music_session.html.haml
+++ b/web/app/views/users/_feed_music_session.html.haml
@@ -8,7 +8,7 @@
       %a{:href => "/sessions/#{feed_item.id}", :target => "_blank"} SESSION
     .artist
       = session_artist_name(feed_item)
-    = timeago(feed_item.created_at, class: 'small created_at')
+    = timeago(feed_item.started_at, class: 'small created_at')
   / name and description
   .left.ml20.w30
     .name.dotdotdot
@@ -28,7 +28,7 @@
       %span.session-status
         = session_text(feed_item)
       / current playback time
-      = session_duration(feed_item, class: 'session-duration tick-duration recording-current', 'data-created-at' => feed_item.created_at.to_i)
+      = session_duration(feed_item, class: 'session-duration tick-duration recording-current', 'data-created-at' => feed_item.started_at.to_i)
     / end recording play controls
     / genre and social
     .left.small
diff --git a/web/app/views/users/_feed_music_session_ajax.html.haml b/web/app/views/users/_feed_music_session_ajax.html.haml
index 44e9cff84..ff7202bbf 100644
--- a/web/app/views/users/_feed_music_session_ajax.html.haml
+++ b/web/app/views/users/_feed_music_session_ajax.html.haml
@@ -11,7 +11,7 @@
       .artist
         %a.artist{:hoveraction => '{{data.feed_item.helpers.artist_hoveraction}}', :profileaction => "{{data.feed_item.helpers.artist_hoveraction}}", :'{{data.feed_item.helpers.artist_datakey}}' => '{{data.feed_item.helpers.artist_id}}'}
           = '{{data.feed_item.helpers.artist_name}}'
-      %time.small.created_at.timeago{datetime: '{{data.feed_item.helpers.utc_created_at}}'}= '{{data.feed_item.created_at}}'
+      %time.small.created_at.timeago{datetime: '{{data.feed_item.helpers.utc_created_at}}'}= '{{data.feed_item.started_at}}'
     / name and description
     .left.ml20.w30
       .name.dotdotdot