From 563b7864f90089f121f38387614b29331fbd535c Mon Sep 17 00:00:00 2001
From: Matt Isenhower <matt@isenhower.com>
Date: Thu, 21 Sep 2017 14:44:43 -0700
Subject: [PATCH] Twitter: Display Salmon Run duration in hours

---
 src/js/components/splatoon/SalmonRunBox.vue |  2 +-
 src/js/filters.js                           | 12 +++---------
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/js/components/splatoon/SalmonRunBox.vue b/src/js/components/splatoon/SalmonRunBox.vue
index 25aaeae..cc78864 100644
--- a/src/js/components/splatoon/SalmonRunBox.vue
+++ b/src/js/components/splatoon/SalmonRunBox.vue
@@ -29,7 +29,7 @@
                         </div>
                         <template v-if="screenshotMode">
                             <div class="title-color is-size-5">
-                                {{ currentSchedule.end_time - now | durationDaysHours }} remaining
+                                {{ currentSchedule.end_time - now | durationHours }} remaining
                             </div>
                         </template>
                         <template v-else>
diff --git a/src/js/filters.js b/src/js/filters.js
index 2389be6..6ac721c 100644
--- a/src/js/filters.js
+++ b/src/js/filters.js
@@ -78,15 +78,9 @@ Vue.filter('shortDuration', function (value) {
     return (seconds == 1) ? `${negative}1 second` : `${negative}${seconds} seconds`;
 });
 
-Vue.filter('durationDaysHours', function (value) {
+Vue.filter('durationHours', function (value) {
     let { negative, days, hours, minutes, seconds } = getDurationParts(value);
-    let result = '';
 
-    if (days)
-        result += (days == 1) ? `${negative}1 day` : `${negative}${days} days`;
-    if (days && hours)
-        result += ', ';
-    if (hours)
-        result += (hours == 1) ? `${negative}1 hour` : `${negative}${hours} hours`;
-    return result.trim();
+    hours += 24 * days;
+    return (hours == 1) ? `${negative}1 hour` : `${negative}${hours} hours`;
 });