1 files changed, 40 insertions, 4 deletions

diff --git a/client/src/assets/player/utils.ts b/client/src/assets/player/utils.ts
index c27e630e5..c02e19929 100644
--- a/client/src/assets/player/utils.ts
+++ b/client/src/assets/player/utils.ts
@@ -24,15 +24,50 @@ function isMobile () {
 }
 
 function buildVideoLink (time?: number) {
-  let href = window.location.href.replace('/embed/', '/watch/')
+  const baseEmbedPath = window.location.pathname.replace('/embed/', '/watch/')
+  const baseEmbedURL = window.location.origin + baseEmbedPath
+
   if (time) {
     const timeInt = Math.floor(time)
 
-    if (window.location.search) href += '&start=' + timeInt
-    else href += '?start=' + timeInt
+    const params = new URLSearchParams(window.location.search)
+    params.set('start', secondsToTime(timeInt))
+
+    return baseEmbedURL + '?' + params.toString()
   }
 
-  return href
+  return baseEmbedURL
+}
+
+function timeToInt (time: number | string) {
+  if (typeof time === 'number') return time
+
+  const reg = /^((\d+)h)?((\d+)m)?((\d+)s?)?$/
+  const matches = time.match(reg)
+
+  if (!matches) return 0
+
+  const hours = parseInt(matches[2] || '0', 10)
+  const minutes = parseInt(matches[4] || '0', 10)
+  const seconds = parseInt(matches[6] || '0', 10)
+
+  return hours * 3600 + minutes * 60 + seconds
+}
+
+function secondsToTime (seconds: number) {
+  let time = ''
+
+  let hours = Math.floor(seconds / 3600)
+  if (hours >= 1) time = hours + 'h'
+
+  seconds %= 3600
+  let minutes = Math.floor(seconds / 60)
+  if (minutes >= 1) time += minutes + 'm'
+
+  seconds %= 60
+  if (seconds >= 1) time += seconds + 's'
+
+  return time
 }
 
 function buildVideoEmbed (embedUrl: string) {
@@ -81,6 +116,7 @@ function videoFileMinByResolution (files: VideoFile[]) {
 
 export {
   toTitleCase,
+  timeToInt,
   buildVideoLink,
   buildVideoEmbed,
   videoFileMaxByResolution,