From c7fbaa3f807088b7a8c92b39bd3f94d8ebe70999 Mon Sep 17 00:00:00 2001
From: Joshua Arts <josha5@outlook.com>
Date: Mon, 30 Jul 2018 11:48:11 -0400
Subject: [PATCH] fix recordings lengths

---
 app/controllers/rooms_controller.rb                        | 6 ++----
 app/models/room.rb                                         | 2 +-
 app/views/shared/components/_public_recording_row.html.erb | 2 +-
 app/views/shared/components/_recording_row.html.erb        | 6 ++++--
 app/views/shared/components/_room_block.html.erb           | 4 +++-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/controllers/rooms_controller.rb b/app/controllers/rooms_controller.rb
index c179440f..0ffe7ed8 100644
--- a/app/controllers/rooms_controller.rb
+++ b/app/controllers/rooms_controller.rb
@@ -114,11 +114,9 @@ class RoomsController < ApplicationController
   helper_method :recording_date
 
   # Helper for converting BigBlueButton dates into a nice length string.
-  def recording_length(start_time, end_time)
-    len = ((end_time - start_time) * 24 * 60).to_i
-
+  def recording_length(len)
     if len > 60
-      "#{len / 60} hrs"
+      "#{(len / 60).round} hrs"
     elsif len == 0
       "< 1 min"
     else
diff --git a/app/models/room.rb b/app/models/room.rb
index 10370c66..069464da 100644
--- a/app/models/room.rb
+++ b/app/models/room.rb
@@ -113,7 +113,7 @@ class Room < ApplicationRecord
       r.delete(:playback)
     end
 
-    res[:recordings]
+    res[:recordings].sort_by { |rec| rec[:endTime] }.reverse
   end
 
   # Fetches a rooms public recordings.
diff --git a/app/views/shared/components/_public_recording_row.html.erb b/app/views/shared/components/_public_recording_row.html.erb
index 3b272628..17e91cb1 100644
--- a/app/views/shared/components/_public_recording_row.html.erb
+++ b/app/views/shared/components/_public_recording_row.html.erb
@@ -17,7 +17,7 @@
     <div class="small text-muted text-uppercase">
       <%= t("recording.table.length") %>
     </div>
-    <%= recording_length(recording[:startTime], recording[:endTime]) %>
+    <%= recording_length(recording[:playbacks].first[:length]) %>
   </td>
   <td class="text-left">
     <div class="small text-muted text-uppercase">
diff --git a/app/views/shared/components/_recording_row.html.erb b/app/views/shared/components/_recording_row.html.erb
index bd580bd9..412a0226 100644
--- a/app/views/shared/components/_recording_row.html.erb
+++ b/app/views/shared/components/_recording_row.html.erb
@@ -17,7 +17,7 @@
     <div class="small text-muted text-uppercase">
       <%= t("recording.table.length") %>
     </div>
-    <%= recording_length(recording[:startTime], recording[:endTime]) %>
+    <%= recording_length(recording[:playbacks].first[:length]) %>
   </td>
   <td class="text-left">
     <div class="small text-muted text-uppercase">
@@ -49,7 +49,9 @@
   </td>
   <td class="text-center">
     <div class="item-action dropdown">
-      <a href="javascript:void(0)" data-toggle="dropdown" class="icon"><i class="fas fa-ellipsis-v"></i></a>
+      <a href="javascript:void(0)" data-toggle="dropdown" class="icon">
+        <i class="fas fa-ellipsis-v px-4"></i>
+      </a>
       <div class="dropdown-menu dropdown-menu-right">
         <a class="dropdown-item email-link" data-pres-link="<%= p[:url] %>"><i class="dropdown-icon far fa-envelope"></i> <%= t("recording.email") %></a>
         <div class="dropdown-divider"></div>
diff --git a/app/views/shared/components/_room_block.html.erb b/app/views/shared/components/_room_block.html.erb
index 682908dd..c15cb9ff 100644
--- a/app/views/shared/components/_room_block.html.erb
+++ b/app/views/shared/components/_room_block.html.erb
@@ -23,7 +23,9 @@
         </td>
         <td class="text-right">
           <div class="item-action dropdown">
-            <a href="javascript:void(0)" data-toggle="dropdown" class="icon <%= 'invisible' if room == current_user.main_room %>"><i class="fas fa-ellipsis-v px-4"></i></a>
+            <a href="javascript:void(0)" data-toggle="dropdown" class="icon <%= 'invisible' if room == current_user.main_room %>">
+              <i class="fas fa-ellipsis-v px-4"></i>
+            </a>
             <div class="dropdown-menu">
               <!--
               <%= link_to room, class: "dropdown-item" do %>