Fix build

pull/5502/head
Chocobozzz 2022-12-29 10:14:43 +01:00
parent d97d36b486
commit 4fe7cde283
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
5 changed files with 21 additions and 9 deletions

View File

@ -30,7 +30,7 @@ export interface CustomizationOptions {
peertubeLink: boolean peertubeLink: boolean
playbackRate: number | string playbackRate?: number | string
} }
export interface CommonOptions extends CustomizationOptions { export interface CommonOptions extends CustomizationOptions {

View File

@ -38,6 +38,7 @@ export class PlayerManagerOptions {
private enableApi = false private enableApi = false
private startTime: number | string = 0 private startTime: number | string = 0
private stopTime: number | string private stopTime: number | string
private playbackRate: number | string
private title: boolean private title: boolean
private warningTitle: boolean private warningTitle: boolean
@ -130,6 +131,7 @@ export class PlayerManagerOptions {
this.subtitle = getParamString(params, 'subtitle') this.subtitle = getParamString(params, 'subtitle')
this.startTime = getParamString(params, 'start') this.startTime = getParamString(params, 'start')
this.stopTime = getParamString(params, 'stop') this.stopTime = getParamString(params, 'stop')
this.playbackRate = getParamString(params, 'playbackRate')
this.bigPlayBackgroundColor = getParamString(params, 'bigPlayBackgroundColor') this.bigPlayBackgroundColor = getParamString(params, 'bigPlayBackgroundColor')
this.foregroundColor = getParamString(params, 'foregroundColor') this.foregroundColor = getParamString(params, 'foregroundColor')
@ -210,6 +212,8 @@ export class PlayerManagerOptions {
? playlistTracker.getCurrentElement().stopTimestamp ? playlistTracker.getCurrentElement().stopTimestamp
: this.stopTime, : this.stopTime,
playbackRate: this.playbackRate,
videoCaptions, videoCaptions,
inactivityTimeout: 2500, inactivityTimeout: 2500,
videoViewUrl: this.videoFetcher.getVideoViewsUrl(video.uuid), videoViewUrl: this.videoFetcher.getVideoViewsUrl(video.uuid),

View File

@ -24,7 +24,7 @@ describe('Test server redundancy API validators', function () {
// --------------------------------------------------------------- // ---------------------------------------------------------------
before(async function () { before(async function () {
this.timeout(80000) this.timeout(160000)
servers = await createMultipleServers(2) servers = await createMultipleServers(2)

View File

@ -500,7 +500,7 @@ describe('Test moderation notifications', function () {
}) })
it('Should send notification to moderators on new video with auto-blacklist', async function () { it('Should send notification to moderators on new video with auto-blacklist', async function () {
this.timeout(50000) this.timeout(120000)
videoName = 'video with auto-blacklist ' + buildUUID() videoName = 'video with auto-blacklist ' + buildUUID()
const video = await servers[0].videos.upload({ token: userToken1, attributes: { name: videoName } }) const video = await servers[0].videos.upload({ token: userToken1, attributes: { name: videoName } })
@ -512,10 +512,14 @@ describe('Test moderation notifications', function () {
}) })
it('Should not send video publish notification if auto-blacklisted', async function () { it('Should not send video publish notification if auto-blacklisted', async function () {
this.timeout(120000)
await checkVideoIsPublished({ ...userBaseParams, videoName, shortUUID, checkType: 'absence' }) await checkVideoIsPublished({ ...userBaseParams, videoName, shortUUID, checkType: 'absence' })
}) })
it('Should not send a local user subscription notification if auto-blacklisted', async function () { it('Should not send a local user subscription notification if auto-blacklisted', async function () {
this.timeout(120000)
await checkNewVideoFromSubscription({ ...adminBaseParamsServer1, videoName, shortUUID, checkType: 'absence' }) await checkNewVideoFromSubscription({ ...adminBaseParamsServer1, videoName, shortUUID, checkType: 'absence' })
}) })
@ -524,7 +528,7 @@ describe('Test moderation notifications', function () {
}) })
it('Should send video published and unblacklist after video unblacklisted', async function () { it('Should send video published and unblacklist after video unblacklisted', async function () {
this.timeout(40000) this.timeout(120000)
await servers[0].blacklist.remove({ videoId: uuid }) await servers[0].blacklist.remove({ videoId: uuid })
@ -537,15 +541,19 @@ describe('Test moderation notifications', function () {
}) })
it('Should send a local user subscription notification after removed from blacklist', async function () { it('Should send a local user subscription notification after removed from blacklist', async function () {
this.timeout(120000)
await checkNewVideoFromSubscription({ ...adminBaseParamsServer1, videoName, shortUUID, checkType: 'presence' }) await checkNewVideoFromSubscription({ ...adminBaseParamsServer1, videoName, shortUUID, checkType: 'presence' })
}) })
it('Should send a remote user subscription notification after removed from blacklist', async function () { it('Should send a remote user subscription notification after removed from blacklist', async function () {
this.timeout(120000)
await checkNewVideoFromSubscription({ ...adminBaseParamsServer2, videoName, shortUUID, checkType: 'presence' }) await checkNewVideoFromSubscription({ ...adminBaseParamsServer2, videoName, shortUUID, checkType: 'presence' })
}) })
it('Should send unblacklist but not published/subscription notes after unblacklisted if scheduled update pending', async function () { it('Should send unblacklist but not published/subscription notes after unblacklisted if scheduled update pending', async function () {
this.timeout(50000) this.timeout(120000)
const updateAt = new Date(new Date().getTime() + 1000000) const updateAt = new Date(new Date().getTime() + 1000000)
@ -576,7 +584,7 @@ describe('Test moderation notifications', function () {
}) })
it('Should not send publish/subscription notifications after scheduled update if video still auto-blacklisted', async function () { it('Should not send publish/subscription notifications after scheduled update if video still auto-blacklisted', async function () {
this.timeout(40000) this.timeout(120000)
// In 2 seconds // In 2 seconds
const updateAt = new Date(new Date().getTime() + 2000) const updateAt = new Date(new Date().getTime() + 2000)
@ -601,7 +609,7 @@ describe('Test moderation notifications', function () {
}) })
it('Should not send a notification to moderators on new video without auto-blacklist', async function () { it('Should not send a notification to moderators on new video without auto-blacklist', async function () {
this.timeout(50000) this.timeout(120000)
const name = 'video without auto-blacklist ' + buildUUID() const name = 'video without auto-blacklist ' + buildUUID()

View File

@ -120,7 +120,7 @@ describe('Object storage for video static file privacy', function () {
// --------------------------------------------------------------------------- // ---------------------------------------------------------------------------
it('Should upload a private video and have appropriate object storage ACL', async function () { it('Should upload a private video and have appropriate object storage ACL', async function () {
this.timeout(60000) this.timeout(120000)
{ {
const { uuid } = await server.videos.quickUpload({ name: 'video', privacy: VideoPrivacy.PRIVATE }) const { uuid } = await server.videos.quickUpload({ name: 'video', privacy: VideoPrivacy.PRIVATE })
@ -138,7 +138,7 @@ describe('Object storage for video static file privacy', function () {
}) })
it('Should upload a public video and have appropriate object storage ACL', async function () { it('Should upload a public video and have appropriate object storage ACL', async function () {
this.timeout(60000) this.timeout(120000)
const { uuid } = await server.videos.quickUpload({ name: 'video', privacy: VideoPrivacy.UNLISTED }) const { uuid } = await server.videos.quickUpload({ name: 'video', privacy: VideoPrivacy.UNLISTED })
await waitJobs([ server ]) await waitJobs([ server ])