X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=client%2Fsrc%2Fassets%2Fplayer%2Futils.ts;h=8d87567c2b53dd75b412f8080c7c6c92d181571f;hb=b718fd22374d64534bcfe69932cf562894abed6a;hp=c27e630e58dd39610a68eec3e17584181abbf2a7;hpb=7b3a99d51716e404bdea0cef8d1f994aab0e8aac;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/client/src/assets/player/utils.ts b/client/src/assets/player/utils.ts
index c27e630e5..8d87567c2 100644
--- a/client/src/assets/player/utils.ts
+++ b/client/src/assets/player/utils.ts
@@ -12,7 +12,7 @@ const dictionaryBytes: Array<{max: number, type: string}> = [
   { max: 1073741824, type: 'MB' },
   { max: 1.0995116e12, type: 'GB' }
 ]
-function bytes (value) {
+function bytes (value: number) {
   const format = dictionaryBytes.find(d => value < d.max) || dictionaryBytes[dictionaryBytes.length - 1]
   const calc = Math.floor(value / (format.max / 1024)).toString()
 
@@ -23,16 +23,51 @@ function isMobile () {
   return /iPhone|iPad|iPod|Android/i.test(navigator.userAgent)
 }
 
-function buildVideoLink (time?: number) {
-  let href = window.location.href.replace('/embed/', '/watch/')
+function buildVideoLink (time?: number, url?: string) {
+  if (!url) url = window.location.origin + window.location.pathname.replace('/embed/', '/watch/')
+
   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 url + '?' + params.toString()
   }
 
-  return href
+  return url
+}
+
+function timeToInt (time: number | string) {
+  if (!time) return 0
+  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) {
@@ -77,10 +112,25 @@ function videoFileMinByResolution (files: VideoFile[]) {
   return min
 }
 
+function getRtcConfig () {
+  return {
+    iceServers: [
+      {
+        urls: 'stun:stun.stunprotocol.org'
+      },
+      {
+        urls: 'stun:stun.framasoft.org'
+      }
+    ]
+  }
+}
+
 // ---------------------------------------------------------------------------
 
 export {
+  getRtcConfig,
   toTitleCase,
+  timeToInt,
   buildVideoLink,
   buildVideoEmbed,
   videoFileMaxByResolution,