From 3c8dfb84b555cb891a99758afd95a4bf28d0ba31 Mon Sep 17 00:00:00 2001
From: Duane Jaspers <37299563+DuaneJaspers@users.noreply.github.com>
Date: Sat, 31 Oct 2020 15:57:51 +0100
Subject: [PATCH] Change to only consider currently live broadcasts as
 livestreams. (#728)

* Remove isLiveContent, so only now live is true

* Change Published on to Streamed on when applicable
---
 .../watch-video-info/watch-video-info.js       | 18 ++++++++++++++++++
 .../watch-video-info/watch-video-info.vue      |  2 +-
 src/renderer/views/Watch/Watch.js              |  4 +++-
 src/renderer/views/Watch/Watch.vue             |  2 ++
 static/locales/en-US.yaml                      |  2 ++
 5 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/watch-video-info/watch-video-info.js b/src/renderer/components/watch-video-info/watch-video-info.js
index 192236ba..4d72257a 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.js
+++ b/src/renderer/components/watch-video-info/watch-video-info.js
@@ -63,6 +63,14 @@ export default Vue.extend({
       type: Function,
       required: true
     },
+    isLive: {
+      type: Boolean,
+      required: false
+    },
+    isLiveContent: {
+      type: Boolean,
+      required: true
+    },
     isUpcoming: {
       type: Boolean,
       required: true
@@ -177,6 +185,16 @@ export default Vue.extend({
       const dateSplit = date.toDateString().split(' ')
       const localeDateString = `Video.Published.${dateSplit[1]}`
       return `${this.$t(localeDateString)} ${dateSplit[2]}, ${dateSplit[3]}`
+    },
+
+    publishedString() {
+      if (this.isLiveContent && this.isLive) {
+        return this.$t('Video.Started streaming on')
+      } else if (this.isLiveContent && !this.isLive) {
+        return this.$t('Video.Streamed on')
+      } else {
+        return this.$t('Video.Published on')
+      }
     }
   },
   methods: {
diff --git a/src/renderer/components/watch-video-info/watch-video-info.vue b/src/renderer/components/watch-video-info/watch-video-info.vue
index 15af04c8..4086286f 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.vue
+++ b/src/renderer/components/watch-video-info/watch-video-info.vue
@@ -39,7 +39,7 @@
     </div>
     <div>
       <div class="datePublished">
-        {{ $t("Video.Published on") }} {{ dateString }}
+        {{ publishedString }} {{ dateString }}
       </div>
       <div class="viewCount">
         {{ parsedViewCount }}
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 0194938d..2aefcf91 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -44,6 +44,7 @@ export default Vue.extend({
       showYouTubeNoCookieEmbed: false,
       hidePlayer: false,
       isLive: false,
+      isLiveContent: false,
       isUpcoming: false,
       upcomingTimestamp: null,
       activeFormat: 'legacy',
@@ -234,7 +235,8 @@ export default Vue.extend({
             this.videoLikeCount = result.videoDetails.likes
             this.videoDislikeCount = result.videoDetails.dislikes
           }
-          this.isLive = result.player_response.videoDetails.isLiveContent || result.player_response.videoDetails.isLive
+          this.isLive = result.player_response.videoDetails.isLive
+          this.isLiveContent = result.player_response.videoDetails.isLiveContent
           this.isUpcoming = result.player_response.videoDetails.isUpcoming ? result.player_response.videoDetails.isUpcoming : false
 
           if (!this.isLive && !this.isUpcoming) {
diff --git a/src/renderer/views/Watch/Watch.vue b/src/renderer/views/Watch/Watch.vue
index 949cf4ec..0a026c90 100644
--- a/src/renderer/views/Watch/Watch.vue
+++ b/src/renderer/views/Watch/Watch.vue
@@ -74,6 +74,8 @@
         :dislike-count="videoDislikeCount"
         :view-count="videoViewCount"
         :get-timestamp="getTimestamp"
+        :is-live-content="isLiveContent"
+        :is-live="isLive"
         :is-upcoming="isUpcoming"
         :download-links="downloadLinks"
         class="watchVideo"
diff --git a/static/locales/en-US.yaml b/static/locales/en-US.yaml
index 860acce4..2f53e590 100644
--- a/static/locales/en-US.yaml
+++ b/static/locales/en-US.yaml
@@ -463,6 +463,8 @@ Video:
     Ago: Ago
     Upcoming: Premieres on
   Published on: Published on
+  Streamed on: Streamed on
+  Started streaming on: Started streaming on
   # $ is replaced with the number and % with the unit (days, hours, minutes...)
   Publicationtemplate: $ % ago
 #& Videos