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

diff --git a/client/src/assets/player/utils.ts b/client/src/assets/player/utils.ts
index 4eaf53720..8d87567c2 100644
--- a/client/src/assets/player/utils.ts
+++ b/client/src/assets/player/utils.ts
@@ -1,4 +1,3 @@
-import { is18nLocale, isDefaultLocale } from '../../../../shared/models/i18n/i18n'
 import { VideoFile } from '../../../../shared/models/videos'
 
 function toTitleCase (str: string) {
@@ -13,74 +12,67 @@ 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()
 
   return [ calc, format.type ]
 }
 
-function getStoredVolume () {
-  const value = getLocalStorage('volume')
-  if (value !== null && value !== undefined) {
-    const valueNumber = parseFloat(value)
-    if (isNaN(valueNumber)) return undefined
-
-    return valueNumber
-  }
-
-  return undefined
+function isMobile () {
+  return /iPhone|iPad|iPod|Android/i.test(navigator.userAgent)
 }
 
-function getStoredMute () {
-  const value = getLocalStorage('mute')
-  if (value !== null && value !== undefined) return value === 'true'
+function buildVideoLink (time?: number, url?: string) {
+  if (!url) url = window.location.origin + window.location.pathname.replace('/embed/', '/watch/')
 
-  return undefined
-}
+  if (time) {
+    const timeInt = Math.floor(time)
 
-function getAverageBandwidth () {
-  const value = getLocalStorage('average-bandwidth')
-  if (value !== null && value !== undefined) {
-    const valueNumber = parseInt(value, 10)
-    if (isNaN(valueNumber)) return undefined
+    const params = new URLSearchParams(window.location.search)
+    params.set('start', secondsToTime(timeInt))
 
-    return valueNumber
+    return url + '?' + params.toString()
   }
 
-  return undefined
+  return url
 }
 
-function saveVolumeInStore (value: number) {
-  return setLocalStorage('volume', value.toString())
-}
+function timeToInt (time: number | string) {
+  if (!time) return 0
+  if (typeof time === 'number') return time
 
-function saveMuteInStore (value: boolean) {
-  return setLocalStorage('mute', value.toString())
-}
+  const reg = /^((\d+)h)?((\d+)m)?((\d+)s?)?$/
+  const matches = time.match(reg)
 
-function saveAverageBandwidth (value: number) {
-  return setLocalStorage('average-bandwidth', value.toString())
-}
+  if (!matches) return 0
 
-function isMobile () {
-  return /iPhone|iPad|iPod|Android/i.test(navigator.userAgent)
+  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 buildVideoLink (time?: number) {
-  let href = window.location.href.replace('/embed/', '/watch/')
-  if (time) {
-    const timeInt = Math.floor(time)
+function secondsToTime (seconds: number) {
+  let time = ''
 
-    if (window.location.search) href += '&start=' + timeInt
-    else href += '?start=' + timeInt
-  }
+  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'
 
-  return href
+  seconds %= 60
+  if (seconds >= 1) time += seconds + 's'
+
+  return time
 }
 
 function buildVideoEmbed (embedUrl: string) {
   return '<iframe width="560" height="315" ' +
+    'sandbox="allow-same-origin allow-scripts" ' +
     'src="' + embedUrl + '" ' +
     'frameborder="0" allowfullscreen>' +
     '</iframe>'
@@ -120,37 +112,30 @@ 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,
-  getStoredVolume,
-  saveVolumeInStore,
-  saveAverageBandwidth,
-  getAverageBandwidth,
-  saveMuteInStore,
   buildVideoEmbed,
-  getStoredMute,
   videoFileMaxByResolution,
   videoFileMinByResolution,
   copyToClipboard,
   isMobile,
   bytes
 }
-
-// ---------------------------------------------------------------------------
-
-const KEY_PREFIX = 'peertube-videojs-'
-
-function getLocalStorage (key: string) {
-  try {
-    return localStorage.getItem(KEY_PREFIX + key)
-  } catch {
-    return undefined
-  }
-}
-
-function setLocalStorage (key: string, value: string) {
-  try {
-    localStorage.setItem(KEY_PREFIX + key, value)
-  } catch { /* empty */ }
-}