Merge pull request #130 from VioletRose/share-video-at-current-time

Adding "at current time" share menu buttons

src/renderer/components/ft-share-button/ft-share-button.js

@@ -1,19 +1,32 @@
 import Vue from 'vue'
 
+import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtIconButton from '../ft-icon-button/ft-icon-button.vue'
 import FtButton from '../ft-button/ft-button.vue'
+import FtToggleSwitch from '../ft-toggle-switch/ft-toggle-switch.vue'
 import { mapActions } from 'vuex'
 
 export default Vue.extend({
   name: 'FtShareButton',
   components: {
+    'ft-flex-box': FtFlexBox,
     'ft-icon-button': FtIconButton,
-    'ft-button': FtButton
+    'ft-button': FtButton,
+    'ft-toggle-switch': FtToggleSwitch
   },
   props: {
     id: {
       type: String,
       required: true
+    },
+    getTimestamp: {
+      type: Function,
+      required: true
+    }
+  },
+  data: function () {
+    return {
+      includeTimestamp: false
     }
   },
   computed: {
@@ -40,7 +53,6 @@ export default Vue.extend({
     youtubeEmbedURL() {
       return `https://www.youtube-nocookie.com/embed/${this.id}`
     }
-
   },
   methods: {
     copy(text) {
@@ -55,7 +67,7 @@ export default Vue.extend({
     },
 
     openInvidious() {
-      this.open(this.invidiousURL)
+      this.open(this.getFinalUrl(this.invidiousURL))
       this.$refs.iconButton.toggleDropdown()
     },
 
@@ -63,12 +75,12 @@ export default Vue.extend({
       this.showToast({
         message: this.$t('Share.Invidious URL copied to clipboard')
       })
-      this.copy(this.invidiousURL)
+      this.copy(this.getFinalUrl(this.invidiousURL))
       this.$refs.iconButton.toggleDropdown()
     },
 
     openYoutube() {
-      this.open(this.youtubeURL)
+      this.open(this.getFinalUrl(this.youtubeURL))
       this.$refs.iconButton.toggleDropdown()
     },
 
@@ -76,12 +88,12 @@ export default Vue.extend({
       this.showToast({
         message: this.$t('Share.YouTube URL copied to clipboard')
       })
-      this.copy(this.youtubeURL)
+      this.copy(this.getFinalUrl(this.youtubeURL))
       this.$refs.iconButton.toggleDropdown()
     },
 
     openYoutubeEmbed() {
-      this.open(this.youtubeEmbedURL)
+      this.open(this.getFinalUrl(this.youtubeEmbedURL))
       this.$refs.iconButton.toggleDropdown()
     },
 
@@ -89,12 +101,12 @@ export default Vue.extend({
       this.showToast({
         message: this.$t('Share.YouTube Embed URL copied to clipboard')
       })
-      this.copy(this.youtubeEmbedURL)
+      this.copy(this.getFinalUrl(this.youtubeEmbedURL))
       this.$refs.iconButton.toggleDropdown()
     },
 
     openInvidiousEmbed() {
-      this.open(this.invidiousEmbedURL)
+      this.open(this.getFinalUrl(this.invidiousEmbedURL))
       this.$refs.iconButton.toggleDropdown()
     },
 
@@ -102,10 +114,18 @@ export default Vue.extend({
       this.showToast({
         message: this.$t('Share.Invidious Embed URL copied to clipboard')
       })
-      this.copy(this.invidiousEmbedURL)
+      this.copy(this.getFinalUrl(this.invidiousEmbedURL))
       this.$refs.iconButton.toggleDropdown()
     },
 
+    updateincludeTimestamp() {
+      this.includeTimestamp = !this.includeTimestamp
+    },
+
+    getFinalUrl(url) {
+      return this.includeTimestamp ? `${url}&t=${this.getTimestamp()}` : url
+    },
+
     ...mapActions([
       'showToast'
     ])

src/renderer/components/ft-share-button/ft-share-button.vue

@@ -7,6 +7,14 @@
     dropdown-position-x="left"
     :force-dropdown="true"
   >
+    <ft-flex-box>
+      <ft-toggle-switch
+        :label="$t('Share.Include Timestamp')"
+        :compact="true"
+        :default-value="includeTimestamp"
+        @change="updateincludeTimestamp"
+      />
+    </ft-flex-box>
     <div class="shareLinks">
       <div class="header">
         <img

src/renderer/components/watch-video-info/watch-video-info.js

@@ -58,6 +58,10 @@ export default Vue.extend({
     dislikeCount: {
       type: Number,
       default: 0
+    },
+    getTimestamp: {
+      type: Function,
+      required: true
     }
   },
   data: function () {

src/renderer/components/watch-video-info/watch-video-info.vue

@@ -77,6 +77,7 @@
         />
         <ft-share-button
           :id="id"
+          :get-timestamp="getTimestamp"
           class="option"
         />
       </div>

src/renderer/views/Watch/Watch.js

@@ -611,7 +611,7 @@ export default Vue.extend({
         const player = this.$refs.videoPlayer.player
 
         if (player !== null && this.saveWatchedProgress) {
-          const currentTime = this.$refs.videoPlayer.player.currentTime()
+          const currentTime = this.getWatchedProgress()
           const payload = {
             videoId: this.videoId,
             watchProgress: currentTime
@@ -765,6 +765,14 @@ export default Vue.extend({
       })
     },
 
+    getWatchedProgress: function () {
+      return this.$refs.videoPlayer && this.$refs.videoPlayer.player ? this.$refs.videoPlayer.player.currentTime() : 0
+    },
+
+    getTimestamp: function () {
+      return Math.floor(this.getWatchedProgress())
+    },
+
     ...mapActions([
       'showToast',
       'buildVTTFileLocally',

src/renderer/views/Watch/Watch.vue

@@ -42,6 +42,7 @@
         :like-count="videoLikeCount"
         :dislike-count="videoDislikeCount"
         :view-count="videoViewCount"
+        :get-timestamp="getTimestamp"
         class="watchVideo"
         :class="{ theatreWatchVideo: useTheatreMode }"
         @theatreMode="toggleTheatreMode"

static/locales/en-US.yaml

@@ -424,6 +424,7 @@ Change Format:
   Use Audio Formats: Use Audio Formats
 Share:
   Share Video: Share Video
+  Include Timestamp: Include Timestamp
   Copy Link: Copy Link
   Open Link: Open Link
   Copy Embed: Copy Embed