From af4ae64f6faf38f8179f2e07d3cd4ad60006be92 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 2 Nov 2020 15:43:44 +0100
Subject: Begin live tests

---
 shared/extra-utils/server/servers.ts                      |  5 ++++-
 shared/extra-utils/videos/live.ts                         | 14 ++++++++------
 shared/models/activitypub/objects/video-torrent-object.ts |  2 ++
 shared/models/users/user-right.enum.ts                    |  1 +
 shared/models/videos/video-create.model.ts                |  4 ++--
 5 files changed, 17 insertions(+), 9 deletions(-)

(limited to 'shared')

diff --git a/shared/extra-utils/server/servers.ts b/shared/extra-utils/server/servers.ts
index 994aac628..b4bd55968 100644
--- a/shared/extra-utils/server/servers.ts
+++ b/shared/extra-utils/server/servers.ts
@@ -10,10 +10,12 @@ import { randomInt } from '../../core-utils/miscs/miscs'
 
 interface ServerInfo {
   app: ChildProcess
+
   url: string
   host: string
-
+  hostname: string
   port: number
+
   parallel: boolean
   internalServerNumber: number
   serverNumber: number
@@ -109,6 +111,7 @@ async function flushAndRunServer (serverNumber: number, configOverride?: Object,
     serverNumber,
     url: `http://localhost:${port}`,
     host: `localhost:${port}`,
+    hostname: 'localhost',
     client: {
       id: null,
       secret: null
diff --git a/shared/extra-utils/videos/live.ts b/shared/extra-utils/videos/live.ts
index f500fdc3e..65942db0a 100644
--- a/shared/extra-utils/videos/live.ts
+++ b/shared/extra-utils/videos/live.ts
@@ -2,8 +2,8 @@ import * as ffmpeg from 'fluent-ffmpeg'
 import { LiveVideoCreate, LiveVideoUpdate, VideoDetails, VideoState } from '@shared/models'
 import { buildAbsoluteFixturePath, wait } from '../miscs/miscs'
 import { makeGetRequest, makePutBodyRequest, makeUploadRequest } from '../requests/requests'
-import { ServerInfo } from '../server/servers'
-import { getVideo, getVideoWithToken } from './videos'
+import { getVideoWithToken } from './videos'
+import { omit } from 'lodash'
 
 function getLive (url: string, token: string, videoId: number | string, statusCodeExpected = 200) {
   const path = '/api/v1/videos/live'
@@ -31,16 +31,18 @@ function updateLive (url: string, token: string, videoId: number | string, field
 function createLive (url: string, token: string, fields: LiveVideoCreate, statusCodeExpected = 200) {
   const path = '/api/v1/videos/live'
 
-  let attaches: any = {}
-  if (fields.thumbnailfile) attaches = { thumbnailfile: fields.thumbnailfile }
-  if (fields.previewfile) attaches = { previewfile: fields.previewfile }
+  const attaches: any = {}
+  if (fields.thumbnailfile) attaches.thumbnailfile = fields.thumbnailfile
+  if (fields.previewfile) attaches.previewfile = fields.previewfile
+
+  const updatedFields = omit(fields, 'thumbnailfile', 'previewfile')
 
   return makeUploadRequest({
     url,
     path,
     token,
     attaches,
-    fields,
+    fields: updatedFields,
     statusCodeExpected
   })
 }
diff --git a/shared/models/activitypub/objects/video-torrent-object.ts b/shared/models/activitypub/objects/video-torrent-object.ts
index 5b035a371..d99d273c3 100644
--- a/shared/models/activitypub/objects/video-torrent-object.ts
+++ b/shared/models/activitypub/objects/video-torrent-object.ts
@@ -21,7 +21,9 @@ export interface VideoObject {
   views: number
 
   sensitive: boolean
+
   isLiveBroadcast: boolean
+  liveSaveReplay: boolean
 
   commentsEnabled: boolean
   downloadEnabled: boolean
diff --git a/shared/models/users/user-right.enum.ts b/shared/models/users/user-right.enum.ts
index 4c3d9e7c8..e815fa893 100644
--- a/shared/models/users/user-right.enum.ts
+++ b/shared/models/users/user-right.enum.ts
@@ -30,6 +30,7 @@ export const enum UserRight {
   UPDATE_ANY_VIDEO,
   UPDATE_ANY_VIDEO_PLAYLIST,
 
+  GET_ANY_LIVE,
   SEE_ALL_VIDEOS,
   CHANGE_VIDEO_OWNERSHIP,
 
diff --git a/shared/models/videos/video-create.model.ts b/shared/models/videos/video-create.model.ts
index 175327afa..9e980529d 100644
--- a/shared/models/videos/video-create.model.ts
+++ b/shared/models/videos/video-create.model.ts
@@ -18,6 +18,6 @@ export interface VideoCreate {
   scheduleUpdate?: VideoScheduleUpdate
   originallyPublishedAt?: Date | string
 
-  thumbnailfile?: Blob
-  previewfile?: Blob
+  thumbnailfile?: Blob | string
+  previewfile?: Blob | string
 }
-- 
cgit v1.2.3